RanchiMall/ribc
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed applications to request

Browse Source
This commit is contained in:
Sai Raj 2020-06-11 02:46:26 +05:30 committed by GitHub
parent f6481b5868
commit b26fb83057
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
index.html
View File

@ -11718,8 +11718,8 @@
var subAdminOnlyList = [] var subAdminOnlyList = []
if(isSubAdmin){ if(isSubAdmin){
generalDataList.push("TaskApplications", "InternAppications") generalDataList.push("TaskRequests", "InternRequests")
subAdminOnlyList.push("ApplicationStatus") subAdminOnlyList.push("RequestStatus")
} }
var promises = [] var promises = []
for(let data of generalDataList) for(let data of generalDataList)
@ -11734,7 +11734,7 @@
}, },
applyForIntern: function(name, comments = ''){ applyForIntern: function(name, comments = ''){
return floCloudAPI.sendGeneralData([name, comments], "InternAppications") return floCloudAPI.sendGeneralData([name, comments], "InternRequests")
}, },
postInternUpdate: function(updates){ postInternUpdate: function(updates){
@ -11756,7 +11756,7 @@
}, },
applyForTask: function(projectCode, branch, task, comments = ''){ applyForTask: function(projectCode, branch, task, comments = ''){
return floCloudAPI.sendGeneralData([projectCode, branch, task, comments], "TaskApplications") return floCloudAPI.sendGeneralData([projectCode, branch, task, comments], "TaskRequests")
}, },
getProjectList: () => { getProjectList: () => {
@ -11833,12 +11833,12 @@
return "added project details for "+projectCode return "added project details for "+projectCode
}, },
setApplicationStatus: function(vectorClock, status){ setRequestStatus: function(vectorClock, status){
return floCloudAPI.sendGeneralData({vectorClock, status}, "ApplicationStatus") return floCloudAPI.sendGeneralData({vectorClock, status}, "RequestStatus")
}, },
getApplicationStatus: function(vectorClock = null){ getRequestStatus: function(vectorClock = null){
var filterStr = floDapps.util.getFilterString("ApplicationStatus") var filterStr = floDapps.util.getFilterString("RequestStatus")
if(vectorClock){ if(vectorClock){
for(let data of floGlobals.generalData[filterStr]){ for(let data of floGlobals.generalData[filterStr]){
if(data.message.vectorClock === vectorClock) if(data.message.vectorClock === vectorClock)
@ -11853,18 +11853,18 @@
} }
}, },
getInternApplications: function(ignoreProcessed = true){ getInternRequests: function(ignoreProcessed = true){
var filterStr = floDapps.util.getFilterString("InternAppications") var filterStr = floDapps.util.getFilterString("InternRequests")
var internApplications = floGlobals.generalData[filterStr].map(data => {return {floID: data.sender, vectorClock: data.vectorClock, name: data.message[0], comments: data.message[1]}}) var internRequests = floGlobals.generalData[filterStr].map(data => {return {floID: data.sender, vectorClock: data.vectorClock, name: data.message[0], comments: data.message[1]}})
//filter existing interns //filter existing interns
internApplications = internApplications.filter(data => !(data.floID in floGlobals.appObjects.RIBC.internList)) internRequests = internRequests.filter(data => !(data.floID in floGlobals.appObjects.RIBC.internList))
//filter processed applications //filter processed requests
var applicationStatus = this.getApplicationStatus() var applicationStatus = this.getRequestStatus()
if (ignoreProcessed) if (ignoreProcessed)
internApplications = internApplications.filter(data => !(data.vectorClock in applicationStatus)) internRequests = internRequests.filter(data => !(data.vectorClock in applicationStatus))
else else
internApplications.forEach(data => data.status = applicationStatus[data.vectorClock]) internRequests.forEach(data => data.status = applicationStatus[data.vectorClock])
return internApplications return internRequests
}, },
addIntern: function(floID, internName){ addIntern: function(floID, internName){
@ -11882,18 +11882,18 @@
return "Intern rating Updated"; return "Intern rating Updated";
}, },
getTaskApplications: function(ignoreProcessed = true){ getTaskRequests: function(ignoreProcessed = true){
var filterStr = floDapps.util.getFilterString("TaskApplications") var filterStr = floDapps.util.getFilterString("TaskRequests")
var taskApplications = floGlobals.generalData[filterStr].map(data => {return {floID: data.sender, vectorClock: data.vectorClock, projectCode: data.message[0], branch: data.message[1], task: data.message[2], comments: data.message[3]}}) var taskRequests = floGlobals.generalData[filterStr].map(data => {return {floID: data.sender, vectorClock: data.vectorClock, projectCode: data.message[0], branch: data.message[1], task: data.message[2], comments: data.message[3]}})
//filter only intern applications //filter only intern requests
taskApplications = taskApplications.filter(data => data.floID in floGlobals.appObjects.RIBC.internList) taskRequests = taskRequests.filter(data => data.floID in floGlobals.appObjects.RIBC.internList)
//filter processed applications //filter processed requests
var applicationStatus = this.getApplicationStatus() var applicationStatus = this.getRequestStatus()
if (ignoreProcessed) if (ignoreProcessed)
taskApplications = taskApplications.filter(data => !(data.vectorClock in applicationStatus)) taskRequests = taskRequests.filter(data => !(data.vectorClock in applicationStatus))
else else
taskApplications.forEach(data => data.status = applicationStatus[data.vectorClock]) taskRequests.forEach(data => data.status = applicationStatus[data.vectorClock])
return taskApplications return taskRequests
}, },
assignInternToTask: function(floID, projectCode, branch, taskNumber){ assignInternToTask: function(floID, projectCode, branch, taskNumber){
@ -13416,7 +13416,7 @@
if(floGlobals.subAdmins.includes(myFloID)){ if(floGlobals.subAdmins.includes(myFloID)){
typeOfUser = 'admin' typeOfUser = 'admin'
let requestsContainer = document.getElementById('requests_container'); let requestsContainer = document.getElementById('requests_container');
RIBC.manage.getTaskApplications().forEach((app) => { RIBC.manage.getTaskRequests().forEach((app) => {
try{ try{
if(!Array.isArray(RIBC.getAssignedInterns(app.projectCode, app.branch, app.task)) && typeof RIBC.getTaskDetails(app.projectCode, app.branch, app.task) !== 'undefined') if(!Array.isArray(RIBC.getAssignedInterns(app.projectCode, app.branch, app.task)) && typeof RIBC.getTaskDetails(app.projectCode, app.branch, app.task) !== 'undefined')
frag.appendChild(render.requestCard(app.floID, app.projectCode, app.branch, app.task)) frag.appendChild(render.requestCard(app.floID, app.projectCode, app.branch, app.task))