Minor UI improvement

wongjiahau · Dec 1, 2018 · 5d07e66 · 5d07e66
1 parent ee03631
commit 5d07e66
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 21 deletions.
diff --git a/ts/model/timetableSummary.ts b/ts/model/timetableSummary.ts
@@ -23,11 +23,10 @@ export class SubjectSummary {
         this.Tutorial = extract("T");
         this.Practical = extract("P");
 
-        const creditHour = slots[0].CreditHour;
-            // Why slots[0] ?
-            // Actually it can be any slots, because the CreditHour of each slots
-            // from the same subject will have the same value
-            // This is a form of data denormalization
+        // According to Dr. Madhavan,
+        // the credit hour can be obtained from the last digit of the subject code
+        const creditHour = this.SubjectCode.slice(-1)[0];
+
         this.CreditHour = parseFloat(creditHour ? creditHour : "0.0");
     }
 

diff --git a/ts/react/slotView.tsx b/ts/react/slotView.tsx
@@ -90,9 +90,7 @@ ISlotViewState > {
                     aria-owns={Boolean(this.state.anchorEl) ? "popover" : undefined}
                     aria-haspopup="true"
                     >
-                    <b>
-                        {getSlotContent(slot)}
-                    </b>
+                          {getSlotContent(slot)}
                     <br/> {slot.Room[slot.CurrentChoice]}
                     <br/> {slot.WeekNumber[slot.CurrentChoice]}
                 </div>
@@ -145,14 +143,6 @@ ISlotViewState > {
 
         );
     }
-
-    public componentDidUpdate() {
-        if (this.state.isMenuOpen) {
-            console.log(this.state.isMenuOpen);
-            console.log(this.props.slot);
-        }
-    }
-
 }
 
 function tooltipTitle(s : ISlotViewModel, isShowingAlternativeSlotOfThisSlot: boolean) {

diff --git a/ts/react/timetableSummaryView.tsx b/ts/react/timetableSummaryView.tsx
@@ -1,10 +1,7 @@
-const find = require("lodash.find");
 import * as React from "react";
 import {ISlotViewModel} from "../model/slotViewModel";
 import {SubjectSummary, TimetableSummary} from "../model/timetableSummary";
 import { ColorHash } from "../util/colorhash";
-import {Colors} from "./colors/colors";
-import {GenerateColorScheme} from "./colors/generateColorScheme";
 
 interface ITimetableSummaryViewProps {
     slots : ISlotViewModel[];
@@ -16,10 +13,11 @@ export class TimetableSummaryView extends React.Component < ITimetableSummaryVie
             return false;
         }
         const subjectSummaries = new TimetableSummary(this.props.slots).SubjectSummaries;
-        const colorSchemes = GenerateColorScheme(this.props.slots);
         const tableStyle : React.CSSProperties = {
             border: "1px solid black",
-            borderCollapse: "collapse"
+            borderCollapse: "collapse",
+            fontSize: "16px",
+            margin: "10px"
         };
         return (
             // @ts-ignore

diff --git a/ts/react/timetableView/timetableView.tsx b/ts/react/timetableView/timetableView.tsx
@@ -67,6 +67,8 @@ export class TimetableView extends React.Component < ITimetableViewProps, ITimet
         const divStyle : React.CSSProperties = {
             backgroundColor: Colors.WhiteSmoke,
             borderStyle:     "solid",
+            borderWidth:     "1px",
+            borderRadius:    "5px",
             fontFamily:      "roboto",
             margin:          "auto",
             position:        "relative",