Skip to content

Commit 14b3275

Browse files
authored
Merge pull request #137 from nathanshew/change-to-paid
Change to paid
2 parents 5142c72 + 8d5dd06 commit 14b3275

File tree

14 files changed

+51
-41
lines changed

14 files changed

+51
-41
lines changed

docs/UserGuide.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Examples:
147147

148148
### Marking a student's attendance: `mark'
149149

150-
Denotes an existing student as present. The student may either be identified by index number
150+
Denotes an existing student as paid. The student may either be identified by index number
151151
in the edulog (starting from 1) or name (this is both case-sensitive and space-sensitive within the name provided).
152152

153153
Format: `mark <INDEX - must be a positive integer>` OR `mark <STUDENT NAME>`
@@ -156,9 +156,19 @@ Examples:
156156
* `mark 3`
157157
* `mark Alex Yeoh`
158158

159+
### Marking all students' attendance: `markall'
160+
161+
Denotes all existing students as paid.
162+
163+
Format: `markall`
164+
165+
Examples:
166+
* `markall`
167+
* `markall ofoeofn4334f30f04a3dr34r` (all subsequent inputs are ignored)
168+
159169
### Unmarking a student's attendance: `unmark'
160170

161-
Denotes an existing student as absent. The student may either be identified by index number
171+
Denotes an existing student as unpaid. The student may either be identified by index number
162172
in the edulog (starting from 1) or name (this is both case-sensitive and space-sensitive within the name provided).
163173

164174
Format: `unmark <INDEX - must be a positive integer>` OR `unmark <STUDENT NAME>`
@@ -169,7 +179,7 @@ Examples:
169179

170180
### Unmarking all students' attendance: `unmarkall'
171181

172-
Denotes all existing students as absent.
182+
Denotes all existing students as unpaid.
173183

174184
Format: `unmarkall`
175185

src/main/java/seedu/edulog/logic/commands/MarkAllCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import seedu.edulog.model.Model;
66

77
/**
8-
* Mark all students, usually after attendance is taken
8+
* Mark all students, usually after student has paid
99
*/
1010
public class MarkAllCommand extends Command {
1111
public static final String COMMAND_WORD = "markall";

src/main/java/seedu/edulog/logic/commands/MarkCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import seedu.edulog.model.Model;
55

66
/**
7-
* Marks a student identified using it's displayed index from the edulog book.
7+
* Marks a student identified using their displayed index from the edulog book.
88
*/
99
public abstract class MarkCommand extends Command {
1010

src/main/java/seedu/edulog/logic/commands/MarkIndexCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import seedu.edulog.model.student.Student;
1414

1515
/**
16-
* Marks a student as present identified using its displayed index from the edulog book.
16+
* Marks a student as has paid, identified using their displayed index from the edulog book.
1717
*/
1818
public class MarkIndexCommand extends MarkCommand {
1919

src/main/java/seedu/edulog/logic/commands/UnmarkAllCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import seedu.edulog.model.Model;
66

77
/**
8-
* Unmark all students, usually after attendance is taken
8+
* Unmark all students, usually when students have not paid.
99
*/
1010
public class UnmarkAllCommand extends Command {
1111
public static final String COMMAND_WORD = "unmarkall";

src/main/java/seedu/edulog/logic/commands/UnmarkCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import seedu.edulog.model.Model;
55

66
/**
7-
* Unmarks a student identified using its displayed index from the edulog book.
7+
* Unmarks a student identified using their displayed index from the edulog book.
88
*/
99
public abstract class UnmarkCommand extends Command {
1010

src/main/java/seedu/edulog/logic/commands/UnmarkIndexCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import seedu.edulog.model.student.Student;
1414

1515
/**
16-
* Marks a student as absent identified using its displayed index from the edulog book.
16+
* Marks a student as unpaid identified using their displayed index from the edulog book.
1717
*/
1818
public class UnmarkIndexCommand extends UnmarkCommand {
1919

src/main/java/seedu/edulog/logic/commands/UnmarkNameCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import seedu.edulog.model.student.Student;
1313

1414
/**
15-
* Unmarks a student identified using its displayed name from the edulog book.
15+
* Unmarks a student identified using their displayed name from the edulog book.
1616
*/
1717
public class UnmarkNameCommand extends UnmarkCommand {
1818

src/main/java/seedu/edulog/model/EduLog.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,34 +108,34 @@ public void removeStudent(Student key) {
108108
}
109109

110110
/**
111-
* Marks given student as present.
111+
* Marks given student as paid.
112112
*
113-
* @param student the student to mark as present.
113+
* @param student the student to mark as paid.
114114
*/
115115
public void markStudent(Student student) {
116116
requireNonNull(student);
117117
student.mark();
118118
}
119119

120120
/**
121-
* Marks all students as present.
121+
* Marks all students as paid.
122122
*/
123123
public void markAllStudents() {
124124
students.forEach(Student::mark);
125125
}
126126

127127
/**
128-
* Marks given student as absent.
128+
* Marks given student as unpaid.
129129
*
130-
* @param student the student to mark as absent.
130+
* @param student the student to mark as unpaid.
131131
*/
132132
public void unmarkStudent(Student student) {
133133
requireNonNull(student);
134134
student.unmark();
135135
}
136136

137137
/**
138-
* Marks all students as absent.
138+
* Marks all students as unpaid.
139139
*/
140140
public void unmarkAllStudents() {
141141
students.forEach(Student::unmark);

src/main/java/seedu/edulog/model/Model.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public interface Model {
6666
void deleteStudent(Student target);
6767

6868
/**
69-
* Marks the given student as present.
69+
* Marks the given student as paid.
7070
* The student must exist in the address book.
7171
*/
7272
void markStudent(Student target);
@@ -77,7 +77,7 @@ public interface Model {
7777
void markAllStudents();
7878

7979
/**
80-
* Marks the given student as absent.
80+
* Marks the given student as unpaid.
8181
* The student must exist in the address book.
8282
*/
8383
void unmarkStudent(Student target);

0 commit comments

Comments
 (0)