UI tweaks and bug fixes
This commit is contained in:
sairaj mote
parent
3f8b8e8e84
commit
73abed668d
33
index.html
33
index.html
@ -1202,22 +1202,27 @@
|
||||
}
|
||||
}
|
||||
if (!subPageId1) {
|
||||
subPageId1 = userType === 'intern' ? 'my_tasks' : 'all_tasks'
|
||||
if (userType === 'intern')
|
||||
subPageId1 = 'my_tasks'
|
||||
else if (userType === 'admin')
|
||||
subPageId1 = 'projects'
|
||||
else
|
||||
subPageId1 = 'all_tasks'
|
||||
}
|
||||
//creates cards for highest performing interns
|
||||
renderElem(getRef('dashboard_page'), html`
|
||||
<sm-chips id="dashboard_view_selector" class="margin-right-auto" onchange=${handleDashboardViewChange}>
|
||||
${userType === 'intern' ? html`<sm-chip value="intern_view" ?selected=${subPageId1 === 'my_tasks'}>My tasks</sm-chip>` : ''}
|
||||
<sm-chip value="dashboard_tasks_wrapper" ?selected=${subPageId1 === 'all_tasks'}>All tasks</sm-chip>
|
||||
${userType !== 'admin' ? html`<sm-chip value="dashboard_tasks_wrapper" ?selected=${subPageId1 === 'all_tasks'}>All tasks</sm-chip>` : ''}
|
||||
<sm-chip value="projects_wrapper" ?selected=${subPageId1 === 'projects'}>Projects</sm-chip>
|
||||
${floGlobals.isMobileView ? html`<sm-chip value="intern_leaderboard_container">Leaderboard</sm-chip>` : ''}
|
||||
${floGlobals.isMobileView ? html`<sm-chip value="intern_leaderboard_container">Leaderboard</sm-chip>` : ''}
|
||||
</sm-chips>
|
||||
${userType === 'intern' ? html`
|
||||
<section id="intern_view" class="intern-option dashboard-view__item">
|
||||
<ul id="assigned_task_list">${renderedAssignedTasks}</ul>
|
||||
</section>
|
||||
` : ''}
|
||||
<div id="dashboard_tasks_wrapper" class=${`flex flex-direction-column justify-content-center dashboard-view__item ${userType === 'intern' ? 'hidden' : ''}`}>${render.displayTasks(params?.category, params?.search)}</div>
|
||||
${userType !== 'admin' ? html`<div id="dashboard_tasks_wrapper" class=${`flex flex-direction-column justify-content-center dashboard-view__item ${userType === 'intern' ? 'hidden' : ''}`}>${render.displayTasks(params?.category, params?.search)}</div>` : ''}
|
||||
<div id="projects_wrapper" class="grid gap-2 align-items-start align-content-start dashboard-view__item hidden">${render.dashProjects()}</div>
|
||||
<div id="intern_leaderboard_container" class="dashboard-view__item hide-on-mobile">
|
||||
<div class="container-header">
|
||||
@ -2046,7 +2051,7 @@
|
||||
`;
|
||||
},
|
||||
assignedInternCard(internFloId, taskId, options = {}) {
|
||||
const { shouldShowOptions = false } = options
|
||||
const { showOptions = false } = options
|
||||
const { hasDeadlinePassed, elapsedPercentage, taskDeadline } = getTaskDeadline(taskId, internFloId)
|
||||
const taskCompleted = RIBC.getInternRecord(internFloId).completedTasks.hasOwnProperty(taskId)
|
||||
let taskStatus = 'In Progress';
|
||||
@ -2060,12 +2065,12 @@
|
||||
}
|
||||
let isInProgress = !taskCompleted && !hasDeadlinePassed
|
||||
let optionsButton
|
||||
if (shouldShowOptions && taskId && !taskCompleted) {
|
||||
if (showOptions && taskId && !taskCompleted) {
|
||||
optionsButton = html` <button class="unassign-intern-button">
|
||||
<svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 10.586l4.95-4.95 1.414 1.414-4.95 4.95 4.95 4.95-1.414 1.414-4.95-4.95-4.95 4.95-1.414-1.414 4.95-4.95-4.95-4.95L7.05 5.636z"/></svg>
|
||||
</button> `;
|
||||
}
|
||||
const title = isInProgress ? `Deadline: ${getFormattedTime(taskDeadline, 'date-only')}` : ''
|
||||
const title = isInProgress ? `Due ${getFormattedTime(taskDeadline, 'date-only')}` : ''
|
||||
return html`
|
||||
<span class=${`assigned-intern assigned-intern${statusModifier}`} title=${title} data-flo-id="${internFloId}" style=${`--progress: ${elapsedPercentage}`}>
|
||||
${RIBC.getInternList()[internFloId]}
|
||||
@ -2143,11 +2148,11 @@
|
||||
return html`
|
||||
<li class=${`admin-task ${status}`} .dataset=${{ taskId: task }}>
|
||||
<div class="flex align-center gap-0-5 flex-wrap">
|
||||
<div class="admin-task__task-number">ID: ${task}</div>
|
||||
<button class="button button--small button--colored margin-left-auto" onclick=${markTaskAsCompleted}>
|
||||
<div class="admin-task__task-number margin-right-auto">ID: ${task}</div>
|
||||
${assignedInternsCards.length ? html`<button class="button button--small button--colored" onclick=${markTaskAsCompleted}>
|
||||
<svg class="icon margin-right-0-3" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"> <path d="M0 0h24v24H0z" fill="none" /> <path d="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z" /> </svg>
|
||||
Mark as done
|
||||
</button>
|
||||
</button>` : ''}
|
||||
<button class="button icon-only button--colored" title="Edit task" onclick=${openTaskEditingPopup}>
|
||||
<svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"> <path fill="none" d="M0 0h24v24H0z"></path> <path d="M15.728 9.686l-1.414-1.414L5 17.586V19h1.414l9.314-9.314zm1.414-1.414l1.414-1.414-1.414-1.414-1.414 1.414 1.414 1.414zM7.242 21H3v-4.243L16.435 3.322a1 1 0 0 1 1.414 0l2.829 2.829a1 1 0 0 1 0 1.414L7.243 21z"></path> </svg>
|
||||
</button>
|
||||
@ -2162,10 +2167,10 @@
|
||||
<svg class="icon margin-right-0-3" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><g><rect fill="none" height="24" width="24"/></g><g><path d="M20,9V6h-2v3h-3v2h3v3h2v-3h3V9H20z M9,12c2.21,0,4-1.79,4-4c0-2.21-1.79-4-4-4S5,5.79,5,8C5,10.21,6.79,12,9,12z M9,6 c1.1,0,2,0.9,2,2c0,1.1-0.9,2-2,2S7,9.1,7,8C7,6.9,7.9,6,9,6z M15.39,14.56C13.71,13.7,11.53,13,9,13c-2.53,0-4.71,0.7-6.39,1.56 C1.61,15.07,1,16.1,1,17.22V20h16v-2.78C17,16.1,16.39,15.07,15.39,14.56z M15,18H3v-0.78c0-0.38,0.2-0.72,0.52-0.88 C4.71,15.73,6.63,15,9,15c2.37,0,4.29,0.73,5.48,1.34C14.8,16.5,15,16.84,15,17.22V18z"/></g></svg>
|
||||
Assign
|
||||
</button>
|
||||
<button class="button button--small button--colored" onclick=${initTaskScoring}>
|
||||
${assignedInternsCards.length ? html`<button class="button button--small button--colored" onclick=${initTaskScoring}>
|
||||
<svg class="icon margin-right-0-3" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M22 9.24l-7.19-.62L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21 12 17.27 18.18 21l-1.63-7.03L22 9.24zM12 15.4l-3.76 2.27 1-4.28-3.32-2.88 4.38-.38L12 6.1l1.71 4.04 4.38.38-3.32 2.88 1 4.28L12 15.4z"/></svg>
|
||||
Rate
|
||||
</button>
|
||||
</button>` : ''}
|
||||
</div>
|
||||
${assignedInternsCards.length ? html`<div class="flex align-center flex-wrap gap-0-3"> ${assignedInternsCards} </div>` : 'No interns assigned. Click on "Assign" to assign interns.'}
|
||||
</div>
|
||||
@ -2310,7 +2315,7 @@
|
||||
<h4 class="task__title">${title}</h4>
|
||||
<div class=${`task__completion-timeline flex align-center ${hasDeadlinePassed ? 'deadline-passed' : ''}`}>
|
||||
${hasDeadlinePassed ? html`
|
||||
<h3>Deadline passed</h3>
|
||||
<h3>Overdue</h3>
|
||||
`: html`
|
||||
<div class="flex flex-direction-column gap-0-3">
|
||||
<div class="flex align-center gap-0-3">
|
||||
@ -2326,7 +2331,7 @@
|
||||
<div class="flex flex-direction-column gap-0-3">
|
||||
<div class="flex align-center gap-0-3">
|
||||
<svg class="icon" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><g><path d="M0,0h24v24H0V0z" fill="none"/></g><g><g><path d="M11,6H9V4h2V6z M15,4h-2v2h2V4z M9,14h2v-2H9V14z M19,10V8h-2v2H19z M19,14v-2h-2v2H19z M13,14h2v-2h-2V14z M19,4h-2v2h2 V4z M13,8V6h-2v2H13z M7,10V8h2V6H7V4H5v16h2v-8h2v-2H7z M15,12h2v-2h-2V12z M11,10v2h2v-2H11z M9,8v2h2V8H9z M13,10h2V8h-2V10z M15,6v2h2V6H15z"/></g></g></svg>
|
||||
<span style="font-size: 0.8rem;">Deadline</span>
|
||||
<span style="font-size: 0.8rem;">Due</span>
|
||||
</div>
|
||||
<time style="font-size: 0.9rem;font-weight: 500; white-space: nowrap">${getFormattedTime(taskDeadline, 'date-only')}</time>
|
||||
</div>`}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user