Skip to content

Commit

Permalink
Merge pull request nus-cs2103-AY2223S2#67 from AY2223S2-CS2103-F11-1/…
Browse files Browse the repository at this point in the history
…change-css

Change css
  • Loading branch information
ARPspoofing authored Mar 13, 2023
2 parents 0731c4a + 4d695ee commit f1063e8
Show file tree
Hide file tree
Showing 7 changed files with 404 additions and 65 deletions.
25 changes: 6 additions & 19 deletions docs/DeveloperGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -289,25 +289,12 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli

2. Epic: As a CS2040 TA, I can effectively manage and keep track of all my students

| Priority | As a CS2040 …​| I want to …​ | So that I …​ |
|----------|------------------|---------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|
| `* * *` | TA | edit 2040 student's information | can fix erroneously added students |
| `* * *` | TA | delete students from a 2040 event | can remove students who are no longer in the module |
| `* * *` | TA | have a search function to search for the desired student | do not have to scroll through the namelist when marking attendance/giving class participation marks |
| `* * *` | New TA | list all my students of 2040 | can view all my students at a glance |
| `* * *` | TA | view a list of low-performing students at a glance based on grades | can immediately tell who is falling behind and personally offer them help |
| `* *` | Tutorial TA | see the attendance of students during a particular class in a calendar | can manage any admin matters efficiently and correctly, or flag out any low outliers |
| `* *` | Concerned TA | find out which students are suddenly performing poorly/experienced sudden drop in performance | know which students to check in on |
| `* *` | TA | be able to see how my students are doing in their examinations | have data on their individual performance, which allows me to flag out low performers and help them out |
| `* *` | TA | have an an overview of students' progress in tutorials and labs submissions, especially where progress seemed slow or difficult | can identify trends in learning difficulties, ie which specific topics/concepts students seem to generally struggle with |
| `* *` | Lab TA | track my students' progress on weekly lab assignments | can make sure everyone submits their assignments on time and offer guidance if they need it |
| `*` | Concerned Lab TA | view the number of late lab submission per student | can immediately tell who is falling behind and personally offer them help |
| `*` | TA | remind students via email if a 2040 event is rescheduled | will not wast student's time |
| `*` | Busy TA | automatically send out reminders to students about upcoming deadlines | can spend less time on these administrative matters |
| `*` | Busy TA | receive reminders on students who have yet to submit their work nearing the deadline | can check up on them individually if needed |
| `*` | Tutorial TA | know my students' progress on their tutorial questions every week (ie. how many questions they are unsure of) | can decide how to pace my tutorial |
| `*` | Lab TA | see how my students are progressing on weekly topics on Visualgo | can send out reminders if I believe they have missed out on any weekly topics or offer help if they appear to be struggling |
| `*` | Motivational TA | find out who are the most consistent students | can recommend them for future TA positions |
| Priority | As a CS2040 …​| I want to …​ | So that I …​ |
|----------|------------------|------------------------------------------------------------|------------------------------------------------------------------------------------------------------|
| `* * *` | TA | edit 2040 student's information | can fix erroneously added students |
| `* * *` | TA | delete students from a 2040 event | can remove students who are no longer in the module |
| `* * *` | TA | have a search function to search for the desired student | do not have to scroll through the namelist when marking attendance/giving class participation marks |
| `* * *` | New TA | list all my students of 2040 | can view all my students at a glance |

3. Epic: As a CS2040 TA, I can track students progress and information

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/seedu/address/ui/GreetingBar.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public GreetingBar(ObservableList<Person> personList) {
size = personList.size();
}

String greetingText = "Hello, you have " + size + " tasks undone";
String greetingText = "You have " + size + " tasks undone";
greetings.setText(greetingText);
}
}
2 changes: 2 additions & 0 deletions src/main/resources/view/EventListCard.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ProgressBar?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
Expand Down Expand Up @@ -31,6 +32,7 @@
<children>
</children>
</HBox>
<ProgressBar prefHeight="15.0" prefWidth="91.0" progress="0.35" style="-fx-accent: #643FDB;" />
</VBox>
<HBox prefHeight="81.0" prefWidth="150.0" />
<rowConstraints>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/view/EventListPanel.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<VBox xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
<HBox prefWidth="400.0" VBox.vgrow="ALWAYS">
<children>
<ListView fx:id="eventListViewLeftCol" prefHeight="6662.0" prefWidth="278.0" HBox.hgrow="ALWAYS">
<ListView fx:id="eventListViewLeftCol" prefHeight="6662.0" prefWidth="70.0" HBox.hgrow="ALWAYS">
<HBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</HBox.margin>
Expand Down
31 changes: 22 additions & 9 deletions src/main/resources/view/GreetingBar.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,28 @@
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>

<VBox xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
<HBox alignment="CENTER" prefHeight="0.0" prefWidth="340.0" style="-fx-background-color: #1d1d1d;">
<children>
<Label fx:id="greetings" alignment="CENTER" contentDisplay="CENTER" prefHeight="17.0" prefWidth="353.0" style="-fx-background-color: #1d1d1d;" text="Hello, you have tasks today" textAlignment="CENTER">
<HBox.margin>
<Insets />
</HBox.margin>
</Label>
</children>
</HBox>
<HBox alignment="CENTER" prefHeight="0.0" prefWidth="340.0" style="-fx-background-color: #E6ECF0;">
<children>
<Label alignment="CENTER" contentDisplay="CENTER" prefHeight="17.0" prefWidth="353.0" style="-fx-background-color: #E6ECF0;" text="Hello!" textAlignment="CENTER">
<HBox.margin>
<Insets />
</HBox.margin>
</Label>
</children>
</HBox>
<HBox alignment="CENTER" prefHeight="0.0" prefWidth="340.0" style="-fx-background-color: #E6ECF0;">
<children>
<Label fx:id="greetings" alignment="CENTER" contentDisplay="CENTER" prefHeight="17.0" prefWidth="353.0" style="-fx-background-color: #E6ECF0; -fx-text-fill: bold;" text="You have tasks today" textAlignment="CENTER">
<HBox.margin>
<Insets />
</HBox.margin>
<font>
<Font name="Helvetica" size="14.0" />
</font>
</Label>
</children>
</HBox>
</VBox>
Loading

0 comments on commit f1063e8

Please sign in to comment.