@@ -2112,9 +2111,9 @@
details = html`
You applied for
- ${RIBC.getTaskDetails(projectCode.replaceAll('_', '-'), branch, task).title} from
+ ${RIBC.getTaskDetails(projectCode, branch, task).title} from
${branch} of
- ${RIBC.getProjectDetails(projectCode.replaceAll('_', '-')).projectName}
+ ${RIBC.getProjectDetails(projectCode).projectName}
`;
}
return html`
@@ -2184,8 +2183,8 @@
// Adds interns to the database **Only SubAdmins can add interns
function addInternToList() {
let internName = getRef('intern_name_field').value.trim(),
- internFloID = getRef('intern_flo_id_field').value.trim();
- if (RIBC.admin.addIntern(internFloID, internName)) {
+ internFloId = getRef('intern_flo_id_field').value.trim();
+ if (RIBC.admin.addIntern(internFloId, internName)) {
renderElem(getRef('admin_page__intern_list'), filterInterns(''))
closePopup();
notify(`${internName} added as an intern.`, 'success')
@@ -2250,36 +2249,36 @@
}
// opens a popup containing various project information
- function showProjectInfo(projectId) {
- const { projectName, projectDescription } = RIBC.getProjectDetails(projectId);
+ function showProjectInfo(projectCode) {
+ const { projectName, projectDescription } = RIBC.getProjectDetails(projectCode);
getRef('project_explorer__project_title').textContent = projectName; // project name
getRef('project_explorer__project_description').textContent = projectDescription;
- getRef('project_explorer__project_updates').href = `#/updates_page?projectId=${projectId}&internId=all`;
+ getRef('project_explorer__project_updates').href = `#/updates_page?projectCode=${projectCode}&internId=all`;
renderBranches();
}
let currentTask = '';
- function renderAdminProjectView(projectId) {
+ function renderAdminProjectView(projectCode) {
const allProjects = getRef('admin_page__project_list').querySelectorAll('.project-card');
allProjects.forEach(project => project.classList.remove('project-card--active'))
- const targetProject = Array.from(allProjects).find(project => project.getAttribute('href').includes(projectId))
+ const targetProject = Array.from(allProjects).find(project => project.getAttribute('href').includes(projectCode))
if (targetProject)
targetProject.classList.add('project-card--active')
- const { projectName, projectDescription } = RIBC.getProjectDetails(projectId);
+ const { projectName, projectDescription } = RIBC.getProjectDetails(projectCode);
getRef('editing_panel__title').textContent = projectName;
getRef('editing_panel__description').textContent = projectDescription;
renderBranches()
}
function renderBranches() {
- const { id: projectId, branch } = appState.params
+ const { id: projectCode, branch } = appState.params
const taskListContainer = appState.currentPage === 'admin_page' ? 'branch_container' : 'explorer_branch_container';
const branchList = filteredMap(RIBC.getProjectBranches(appState.params.id), (branch) => {
- return render.branchButton({ projectId, branch, page: appState.currentPage, active: branch === appState.params.branch })
+ return render.branchButton({ projectCode, branch, page: appState.currentPage, active: branch === appState.params.branch })
})
renderElem(getRef(taskListContainer), html`${branchList}`)
}
function renderBranchTasks() {
- const { id: projectId, branch } = appState.params
+ const { id: projectCode, branch } = appState.params
const taskListContainer = appState.currentPage === 'admin_page' ? 'task_list' : 'explorer_task_list';
let branchTasks = RIBC.getProjectMap(appState.params.id)[appState.params.branch];
if (branchTasks[1] && !taskListContainer === 'task_list') {
@@ -2287,9 +2286,9 @@
} else {
let tasks = []
if (branch !== 'mainLine') {
- const { startPoint, parentBranch } = getAllBranches(projectId).find(({ branchName }) => branchName === branch)
+ const { startPoint, parentBranch } = getAllBranches(projectCode).find(({ branchName }) => branchName === branch)
tasks.push(html`
- Branched off from ${parentBranch}
+ Branched off from ${parentBranch}
`)
}
if (taskListContainer === 'task_list') {
@@ -2300,9 +2299,9 @@
renderElem(getRef(taskListContainer), html`${tasks}`)
}
}
- function getAllBranches(projectId) {
- const projectMap = RIBC.getProjectMap(projectId)
- const projectBranches = RIBC.getProjectBranches(projectId)
+ function getAllBranches(projectCode) {
+ const projectMap = RIBC.getProjectMap(projectCode)
+ const projectBranches = RIBC.getProjectBranches(projectCode)
return projectBranches.slice(1).map((branchName, index) => {
const [parentBranch, , startPoint, endPoint] = projectMap[branchName]
return {
@@ -2585,15 +2584,11 @@
renderElem(getRef('updates_page__intern_selector'), html`${options}`)
}
- function getUpdatesByProject(projectId) {
- const projectName = RIBC.getProjectDetails(projectId).projectName
+ function getUpdatesByProject(projectCode) {
+ const projectName = RIBC.getProjectDetails(projectCode).projectName
const allUpdates = RIBC.getInternUpdates()
- const filteredUpdates = allUpdates.filter(({ update: { topic, projectId } }) => {
- if (topic) {
- return topic.includes(projectName)
- } else if (projectId) {
- return projectId === projectId
- }
+ const filteredUpdates = allUpdates.filter(({ update: { projectCode: updateProjectCode } }) => {
+ return projectCode === updateProjectCode
})
return filteredUpdates
}
@@ -2663,21 +2658,21 @@
}
}
function setUpdateFilters(filters) {
- const { projectId, internId, date } = filters || getUpdateFilters()
+ const { projectCode, internId, date } = filters || getUpdateFilters()
if (filters) {
- getRef('updates_page__project_selector').value = projectId
+ getRef('updates_page__project_selector').value = projectCode
getRef('updates_page__intern_selector').value = internId
getRef('updates_page__date_selector').value = date || ''
} else {
const dateParam = date !== '' ? `&date=${date}` : ''
- location.hash = `/updates_page?projectId=${projectId}&internId=${internId}${dateParam}`
+ location.hash = `/updates_page?projectCode=${projectCode}&internId=${internId}${dateParam}`
}
}
function getUpdateFilters() {
- const projectId = getRef('updates_page__project_selector').value || 'all'
+ const projectCode = getRef('updates_page__project_selector').value || 'all'
const internId = getRef('updates_page__intern_selector').value || 'all'
const date = getRef('updates_page__date_selector').value || ''
- return { projectId, internId, date }
+ return { projectCode, internId, date }
}
function clearFilter() {
@@ -2691,12 +2686,12 @@
getRef('updates_page__intern_selector').addEventListener('change', e => setUpdateFilters())
getRef('updates_page__date_selector').addEventListener('change', e => setUpdateFilters())
function pinProject(thisBtn) {
- const projectId = thisBtn.closest('.pinned-card').dataset.id;
+ const projectCode = thisBtn.closest('.pinned-card').dataset.id;
pinnedProjects = localStorage.getItem(`${myFloID}_pinned_projects`) ? localStorage.getItem(`${myFloID}_pinned_projects`).split(',') : []
- if (pinnedProjects.includes(projectId)) {
- pinnedProjects = pinnedProjects.filter(project => project !== projectId)
+ if (pinnedProjects.includes(projectCode)) {
+ pinnedProjects = pinnedProjects.filter(project => project !== projectCode)
} else {
- pinnedProjects.push(projectId)
+ pinnedProjects.push(projectCode)
}
localStorage.setItem(`${myFloID}_pinned_projects`, pinnedProjects.join())
render.dashProjects(getRef('pinned_projects'), pinnedProjects)
@@ -2786,14 +2781,14 @@
// store all the projects assigned to interns in array
const allTasks = RIBC.getAllTasks()
for (const taskKey in allTasks) {
- const [projectId, branch, taskNo] = taskKey.split('_')
- const assignedInterns = RIBC.getAssignedInterns(projectId, branch, taskNo)
+ const [projectCode, branch, taskNo] = taskKey.split('_')
+ const assignedInterns = RIBC.getAssignedInterns(projectCode, branch, taskNo)
if (Array.isArray(assignedInterns) && assignedInterns.includes(myFloID)) {
- assignedProjectsList.add(projectId)
- console.log(RIBC.getTaskStatus(projectId, branch, taskNo))
- if (RIBC.getTaskStatus(projectId, branch, taskNo) === 'incomplete') {
+ assignedProjectsList.add(projectCode)
+ console.log(RIBC.getTaskStatus(projectCode, branch, taskNo))
+ if (RIBC.getTaskStatus(projectCode, branch, taskNo) === 'incomplete') {
floGlobals.assignedTasks[floCrypto.randString(16, true)] = {
- projectId,
+ projectCode,
projectBranch: branch,
task: taskNo
}
@@ -2821,9 +2816,9 @@
if (e.target.closest('.send-update-button')) {
const taskCard = e.target.closest('.task-card')
currentTaskId = taskCard.dataset.uniqueId
- const { projectId, projectBranch, task } = floGlobals.assignedTasks[currentTaskId]
- getRef('update_of_project').textContent = RIBC.getProjectDetails(projectId).projectName
- getRef('update_of_task').textContent = RIBC.getTaskDetails(projectId, projectBranch, task).title
+ const { projectCode, projectBranch, task } = floGlobals.assignedTasks[currentTaskId]
+ getRef('update_of_project').textContent = RIBC.getProjectDetails(projectCode).projectName
+ getRef('update_of_task').textContent = RIBC.getTaskDetails(projectCode, projectBranch, task).title
openPopup('post_update_popup')
}
})
@@ -2974,13 +2969,13 @@
getRef('request_type_selector').addEventListener('change', render.internRequests)
function postUpdate() {
- const { projectId, projectBranch, task } = floGlobals.assignedTasks[currentTaskId]
+ const { projectCode, projectBranch, task } = floGlobals.assignedTasks[currentTaskId]
const description = getRef('update__brief').value.trim()
const linkText = getRef('update__link').value.trim()
const link = linkText !== '' ? linkText : null
console.log(link)
if (description !== '') {
- RIBC.postInternUpdate({ projectId, projectBranch, task, description, link })
+ RIBC.postInternUpdate({ projectCode, projectBranch, task, description, link })
.then((result) => {
notify('Update posted', 'success')
closePopup()