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

Minor fix

Browse Source 
getTaskRequests and getInternRequests moved to RIBC (ie, not inside admin now)
This commit is contained in:
sairajzero 2022-09-08 18:11:58 +05:30
parent a069e1f79d
commit 95a279fc44
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.html
View File

@ -16,7 +16,7 @@
const floGlobals = { const floGlobals = {
blockchain: "FLO", blockchain: "FLO",
adminID: "FKAEdnPfjXLHSYwrXQu377ugN4tXU7VGdf", // "FMeiptdJNtYQEtzyYAVNP8fjsDJ1i4EPfE", adminID: "FKAEdnPfjXLHSYwrXQu377ugN4tXU7VGdf", // "FMeiptdJNtYQEtzyYAVNP8fjsDJ1i4EPfE",
application: "TEST_MODE" // "RIBC" application: "TEST_MODE" // "InternManagement"
} }
</script> </script>
<script src="scripts/lib.js"></script> <script src="scripts/lib.js"></script>
@ -2277,7 +2277,7 @@
if (floGlobals.subAdmins.includes(myFloID)) { if (floGlobals.subAdmins.includes(myFloID)) {
typeOfUser = 'admin' typeOfUser = 'admin'
getRef('requests_list').innerHTML = '' getRef('requests_list').innerHTML = ''
RIBC.admin.getTaskRequests().forEach((app) => { RIBC.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.append(render.requestCard(app.floID, app.projectCode, app.branch, app.task)) frag.append(render.requestCard(app.floID, app.projectCode, app.branch, app.task))

44
scripts/ribc.js
View File

@ -1,8 +1,8 @@
(function () { (function() {
const Ribc = window.RIBC = {}; const Ribc = window.RIBC = {};
const Admin = Ribc.admin = {}; const Admin = Ribc.admin = {};
Ribc.init = function (isSubAdmin = false) { Ribc.init = function(isSubAdmin = false) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
Promise.all([refreshObjectData(), refreshGeneralData(isSubAdmin)]) Promise.all([refreshObjectData(), refreshGeneralData(isSubAdmin)])
.then(results => resolve(results)) .then(results => resolve(results))
@ -65,7 +65,7 @@
.catch(error => reject(error)) .catch(error => reject(error))
}); });
Ribc.getInternUpdates = function (count = null) { Ribc.getInternUpdates = function(count = null) {
let internUpdates = Object.values(floGlobals.generalDataset("InternUpdates")).map(data => { let internUpdates = Object.values(floGlobals.generalDataset("InternUpdates")).map(data => {
return { return {
floID: data.senderID, floID: data.senderID,
@ -117,7 +117,7 @@
.catch(error => reject(error)) .catch(error => reject(error))
}); });
Admin.addProjectDetails = function (projectCode, details) { Admin.addProjectDetails = function(projectCode, details) {
if (!(projectCode in _.projectMap)) if (!(projectCode in _.projectMap))
return "Project not Found!"; return "Project not Found!";
if (projectCode in _.projectDetails && typeof projectCode === 'object' && typeof details === 'object') if (projectCode in _.projectDetails && typeof projectCode === 'object' && typeof details === 'object')
@ -128,7 +128,7 @@
return "added project details for " + projectCode; return "added project details for " + projectCode;
} }
Admin.getInternRequests = function (ignoreProcessed = true) { Ribc.getInternRequests = function(ignoreProcessed = true) {
var internRequests = Object.values(floGlobals.generalDataset("InternRequests")).map(data => { var internRequests = Object.values(floGlobals.generalDataset("InternRequests")).map(data => {
return { return {
floID: data.senderID, floID: data.senderID,
@ -146,7 +146,7 @@
return internRequests; return internRequests;
} }
Admin.processInternRequest = function (vectorClock, accept = true) { Admin.processInternRequest = function(vectorClock, accept = true) {
let request = floGlobals.generalDataset("InternRequests")[vectorClock]; let request = floGlobals.generalDataset("InternRequests")[vectorClock];
if (!request) if (!request)
return "Request not found"; return "Request not found";
@ -159,7 +159,7 @@
return status; return status;
} }
const addIntern = Admin.addIntern = function (floID, internName) { const addIntern = Admin.addIntern = function(floID, internName) {
if (floID in _.internList) if (floID in _.internList)
return false return false
_.internList[floID] = internName _.internList[floID] = internName
@ -167,14 +167,14 @@
return true; return true;
} }
Admin.updateInternRating = function (floID, change = 0) { Admin.updateInternRating = function(floID, change = 0) {
if (!(floID in _.internList)) if (!(floID in _.internList))
return "Intern not found!" return "Intern not found!"
_.internRating[floID] += change _.internRating[floID] += change
return "Intern rating Updated"; return "Intern rating Updated";
} }
Admin.getTaskRequests = function (ignoreProcessed = true) { Ribc.getTaskRequests = function(ignoreProcessed = true) {
var taskRequests = Object.values(floGlobals.generalDataset("TaskRequests")).map(data => { var taskRequests = Object.values(floGlobals.generalDataset("TaskRequests")).map(data => {
return { return {
floID: data.senderID, floID: data.senderID,
@ -194,7 +194,7 @@
return taskRequests return taskRequests
} }
Admin.processTaskRequest = function (vectorClock, accept = true) { Admin.processTaskRequest = function(vectorClock, accept = true) {
let request = floGlobals.generalDataset("TaskRequests")[vectorClock]; let request = floGlobals.generalDataset("TaskRequests")[vectorClock];
if (!request) if (!request)
return "Request not found"; return "Request not found";
@ -207,7 +207,7 @@
return status; return status;
} }
const assignInternToTask = Admin.assignInternToTask = function (floID, projectCode, branch, taskNumber) { const assignInternToTask = Admin.assignInternToTask = function(floID, projectCode, branch, taskNumber) {
var index = projectCode + "_" + branch + "_" + taskNumber var index = projectCode + "_" + branch + "_" + taskNumber
if (!Array.isArray(_.internsAssigned[index])) if (!Array.isArray(_.internsAssigned[index]))
_.internsAssigned[index] = [] _.internsAssigned[index] = []
@ -218,18 +218,18 @@
return false return false
} }
Admin.unassignInternFromTask = function (floID, projectCode, branch, taskNumber) { Admin.unassignInternFromTask = function(floID, projectCode, branch, taskNumber) {
var index = projectCode + "_" + branch + "_" + taskNumber var index = projectCode + "_" + branch + "_" + taskNumber
var pos = _.internsAssigned[index].indexOf(floID) var pos = _.internsAssigned[index].indexOf(floID)
if (pos > -1) if (pos > -1)
_.internsAssigned[index].splice(pos, 1) _.internsAssigned[index].splice(pos, 1)
} }
Admin.putTaskStatus = function (taskStatus, projectCode, branch, taskNumber) { Admin.putTaskStatus = function(taskStatus, projectCode, branch, taskNumber) {
_.projectTaskStatus[projectCode + "_" + branch + "_" + taskNumber] = taskStatus; _.projectTaskStatus[projectCode + "_" + branch + "_" + taskNumber] = taskStatus;
}; };
Admin.createProject = function (projectCode) { Admin.createProject = function(projectCode) {
if (projectCode in _.projectMap) { if (projectCode in _.projectMap) {
return "Project Name already exists"; return "Project Name already exists";
} }
@ -237,7 +237,7 @@
return "Project Create: " + projectCode return "Project Create: " + projectCode
} }
Admin.copyBranchtoNewProject = function (oldProjectCode, oldBranch, newProjectCode, newBranchConnection, Admin.copyBranchtoNewProject = function(oldProjectCode, oldBranch, newProjectCode, newBranchConnection,
newStartPoint, newEndPoint) { newStartPoint, newEndPoint) {
//Make sure new branch is a new text string that does not exist in new project //Make sure new branch is a new text string that does not exist in new project
if (oldBranch == "mainLine") { if (oldBranch == "mainLine") {
@ -285,7 +285,7 @@
return _.projectMap[newProjectCode][newBranch]; return _.projectMap[newProjectCode][newBranch];
} }
Admin.deleteTaskInMap = function (projectCode, branch, taskNumber) { Admin.deleteTaskInMap = function(projectCode, branch, taskNumber) {
var arr = _.projectMap[projectCode][branch]; var arr = _.projectMap[projectCode][branch];
var currentIndex; var currentIndex;
for (var i = 4; i < arr.length; i++) { for (var i = 4; i < arr.length; i++) {
@ -359,7 +359,7 @@
arr[1] = arr[1] - 1; arr[1] = arr[1] - 1;
} }
Admin.insertTaskInMap = function (projectCode, branchName, insertPoint) { Admin.insertTaskInMap = function(projectCode, branchName, insertPoint) {
var lastTasks = []; var lastTasks = [];
lastTasks = findLastTaskNumber(projectCode); lastTasks = findLastTaskNumber(projectCode);
var lastNumber = lastTasks[branchName]; var lastNumber = lastTasks[branchName];
@ -391,7 +391,7 @@
//The best error management I have done //The best error management I have done
//Project changing is overdoing right now //Project changing is overdoing right now
//newStartPoint,newEndPoint is optional //newStartPoint,newEndPoint is optional
Admin.changeBranchLine = function (projectCode, branch, newConnection, newStartPoint, newEndPoint) { Admin.changeBranchLine = function(projectCode, branch, newConnection, newStartPoint, newEndPoint) {
//find the task number on the original line where it was branched, and then close the line there //find the task number on the original line where it was branched, and then close the line there
//Do some basic tests //Do some basic tests
if (branch == "mainLine") { if (branch == "mainLine") {
@ -423,7 +423,7 @@
//startOrEndOrNewProject 1=>Start,2=>End .. projectCode and branch will remain same .. mainLines cannot be rerouted //startOrEndOrNewProject 1=>Start,2=>End .. projectCode and branch will remain same .. mainLines cannot be rerouted
//One test is missing .. you cannot connect to a point after end of connected trunk .. do it later .. not critical //One test is missing .. you cannot connect to a point after end of connected trunk .. do it later .. not critical
Admin.changeBranchPoint = function (projectCode, branch, newPoint, startOrEnd) { Admin.changeBranchPoint = function(projectCode, branch, newPoint, startOrEnd) {
var message; var message;
if (branch != "mainLine") { if (branch != "mainLine") {
@ -450,7 +450,7 @@
return message; return message;
} }
const addBranch = Admin.addBranch = function (projectCode1, branch, startPoint, mergePoint) { const addBranch = Admin.addBranch = function(projectCode1, branch, startPoint, mergePoint) {
var arr = findAllBranches(projectCode1); var arr = findAllBranches(projectCode1);
var newBranchName; var newBranchName;
@ -481,12 +481,12 @@
return newBranchName; return newBranchName;
} }
Admin.editTaskDetails = function (taskDetails, projectCode, branch, taskNumber) { Admin.editTaskDetails = function(taskDetails, projectCode, branch, taskNumber) {
//add taskDetails //add taskDetails
_.projectTaskDetails[projectCode + "_" + branch + "_" + taskNumber] = taskDetails; _.projectTaskDetails[projectCode + "_" + branch + "_" + taskNumber] = taskDetails;
} }
Admin.addTaskInMap = function (projectCode, branchName) { Admin.addTaskInMap = function(projectCode, branchName) {
var lastTasks = []; var lastTasks = [];
lastTasks = findLastTaskNumber(projectCode); lastTasks = findLastTaskNumber(projectCode);
var lastNumber = lastTasks[branchName]; var lastNumber = lastTasks[branchName];