round assignment grades and fix some CSS (#30)
diff --git a/dtps.css b/dtps.css
index 8a51acb..49d07c2 100644
--- a/dtps.css
+++ b/dtps.css
@@ -247,7 +247,8 @@
.recentGrade h5 {
color: var(--classColor);
- white-space: nowrap;
+ display: flex;
+ justify-content: space-between;
margin: 0px;
font-size: 18px;
}
@@ -256,8 +257,8 @@
font-weight: bold;
display: inline-block;
overflow: hidden;
+ white-space: nowrap;
text-overflow: ellipsis;
- max-width: calc(100% - 50px);
}
.recentGrade p {
@@ -871,11 +872,11 @@
}
.classContent .card .points {
- float: right;
display: inline-block;
white-space: nowrap;
overflow: hidden;
height: 24px;
+ flex-shrink: 0;
}
.classContent .card .points.spinner {
@@ -994,23 +995,18 @@
}
.classContent .card.assignment h4 {
- font-size: 1.2rem;
+ font-size: 18px;
margin: 0px !important;
white-space: nowrap;
height: 24px;
line-height: 24px;
- overflow: hidden;
+ display: flex;
+ justify-content: space-between;
}
-.classContent .card.assignment h4 span {
+.classContent .card.assignment span {
+ overflow: hidden;
text-overflow: ellipsis;
- overflow: hidden;
- display: inline-block;
- max-width: 100%;
-}
-
-.classContent .card.assignment.graded h4 span {
- max-width: calc(100% - 50px);
}
.card.assignment .statusIcon {
diff --git a/scripts/assignments.js b/scripts/assignments.js
index b8a446e..5dadc93 100644
--- a/scripts/assignments.js
+++ b/scripts/assignments.js
@@ -81,8 +81,8 @@
} else if (!dtpsLMS.useRubricGrades && (assignment.grade || (assignment.grade == 0))) {
scoreHTML = /*html*/`
<div class="assignmentGrade">
- <div class="grade">${assignment.grade}</div>
- <div class="value">/${assignment.value}</div>
+ <div class="grade">${Number(assignment.grade.toFixed(2))}</div>
+ <div class="value">/${Number(assignment.value.toFixed(2))}</div>
${assignment.letter ? `<div class="letter">${assignment.letter.replace("incomplete", `<i class="material-icons">cancel</i>`).replace("complete", `<i class="material-icons">done</i>`)}</div>` : ""}
<div class="percentage">${Math.round((assignment.grade / assignment.value) * 100)}%</div>
</div>
@@ -333,8 +333,7 @@
locale: "en",
initialView: 'dayGridMonth',
events: calEvents,
- eventContent: ( info, createElement ) => {
- console.log(info);
+ eventContent: info => {
const { missing } = info.event.extendedProps;
const html = /*html*/`
<div class='fc-event-main-frame'>
@@ -356,11 +355,9 @@
end: 'prev,next'
},
dateClick: function (info) {
- console.log('Clicked date', info);
// Set the current day and update the upcoming assignments based on that
},
eventClick: function (info) {
- console.log(info)
dtps.assignment(info.event.extendedProps.assignmentID, info.event.extendedProps.classNum);
}
});