code refactoring
This commit is contained in:
parent
d72ef6ffed
commit
de7b5b06b4
@ -1197,6 +1197,10 @@ ul {
|
|||||||
margin-bottom: 0.5rem;
|
margin-bottom: 0.5rem;
|
||||||
border: solid rgba(var(--text-color), 0.1) thin;
|
border: solid rgba(var(--text-color), 0.1) thin;
|
||||||
}
|
}
|
||||||
|
.request-card time {
|
||||||
|
font-size: 0.9rem;
|
||||||
|
color: rgba(var(--text-color), 0.8);
|
||||||
|
}
|
||||||
|
|
||||||
.request-card__description {
|
.request-card__description {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|||||||
2
css/main.min.css
vendored
2
css/main.min.css
vendored
File diff suppressed because one or more lines are too long
@ -1173,6 +1173,10 @@ ul {
|
|||||||
border-radius: 0.5rem;
|
border-radius: 0.5rem;
|
||||||
margin-bottom: 0.5rem;
|
margin-bottom: 0.5rem;
|
||||||
border: solid rgba(var(--text-color), 0.1) thin;
|
border: solid rgba(var(--text-color), 0.1) thin;
|
||||||
|
time {
|
||||||
|
font-size: 0.9rem;
|
||||||
|
color: rgba(var(--text-color), 0.8);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.request-card__description {
|
.request-card__description {
|
||||||
|
|||||||
23
index.html
23
index.html
@ -1320,13 +1320,13 @@
|
|||||||
getConfirmation('Are you sure you want to accept this request?').then(result => {
|
getConfirmation('Are you sure you want to accept this request?').then(result => {
|
||||||
if (result) {
|
if (result) {
|
||||||
const vectorClock = e.delegateTarget.closest('.request-card').dataset.vectorClock
|
const vectorClock = e.delegateTarget.closest('.request-card').dataset.vectorClock
|
||||||
let result
|
|
||||||
if (RIBC.getInternList())
|
if (RIBC.getInternList())
|
||||||
result = RIBC.admin.processTaskRequest(vectorClock, true)
|
RIBC.admin.processTaskRequest(vectorClock, true).then(() => {
|
||||||
if (result === 'Accepted') {
|
notify('Intern assigned, commit changes to make it permanent.', 'success')
|
||||||
notify('Intern assigned, commit changes to make it permanent.', 'success')
|
removeRequest(e.delegateTarget.closest('.request-card'))
|
||||||
removeRequest(e.delegateTarget.closest('.request-card'))
|
}).catch(err => {
|
||||||
}
|
notify(err.message, 'error')
|
||||||
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@ -1336,15 +1336,15 @@
|
|||||||
if (result) {
|
if (result) {
|
||||||
const vectorClock = e.delegateTarget.closest('.request-card').dataset.vectorClock
|
const vectorClock = e.delegateTarget.closest('.request-card').dataset.vectorClock
|
||||||
const type = e.delegateTarget.closest('.request-card').dataset.type
|
const type = e.delegateTarget.closest('.request-card').dataset.type
|
||||||
let result
|
|
||||||
if (type === 'task') {
|
if (type === 'task') {
|
||||||
result = RIBC.admin.processTaskRequest(vectorClock, false)
|
RIBC.admin.processTaskRequest(vectorClock, false).then(() => {
|
||||||
if (result === 'Rejected') {
|
|
||||||
notify('Request rejected', 'success')
|
notify('Request rejected', 'success')
|
||||||
removeRequest(e.delegateTarget.closest('.request-card'))
|
removeRequest(e.delegateTarget.closest('.request-card'))
|
||||||
}
|
}).catch(err => {
|
||||||
|
notify(err, 'error')
|
||||||
|
})
|
||||||
} else if (type === 'internship') {
|
} else if (type === 'internship') {
|
||||||
result = RIBC.admin.processInternRequest(vectorClock, false)
|
const result = RIBC.admin.processInternRequest(vectorClock, false)
|
||||||
if (result === 'Rejected') {
|
if (result === 'Rejected') {
|
||||||
notify('Request rejected', 'success')
|
notify('Request rejected', 'success')
|
||||||
removeRequest(e.delegateTarget.closest('.request-card'))
|
removeRequest(e.delegateTarget.closest('.request-card'))
|
||||||
@ -2127,6 +2127,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
taskRequestCard(request) {
|
taskRequestCard(request) {
|
||||||
|
console.log(request);
|
||||||
const { details: { taskId, name, brief, contact, portfolioLink }, floID, vectorClock } = request
|
const { details: { taskId, name, brief, contact, portfolioLink }, floID, vectorClock } = request
|
||||||
const internName = RIBC.getInternList()[floID];
|
const internName = RIBC.getInternList()[floID];
|
||||||
const [projectCode, branch, task] = taskId.split('_');
|
const [projectCode, branch, task] = taskId.split('_');
|
||||||
|
|||||||
@ -265,8 +265,7 @@
|
|||||||
status = "Accepted";
|
status = "Accepted";
|
||||||
else
|
else
|
||||||
status = "Rejected";
|
status = "Rejected";
|
||||||
floCloudAPI.noteApplicationData(vectorClock, status).then(_ => null).catch(e => console.error(e))
|
return floCloudAPI.noteApplicationData(vectorClock, status)
|
||||||
return status;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const assignInternToTask = Admin.assignInternToTask = function (floID, projectCode, branch, taskNumber) {
|
const assignInternToTask = Admin.assignInternToTask = function (floID, projectCode, branch, taskNumber) {
|
||||||
|
|||||||
2
scripts/ribc.min.js
vendored
2
scripts/ribc.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user