|
8 | 8 | import java.io.FileReader;
|
9 | 9 | import java.io.IOException;
|
10 | 10 | import java.util.ArrayList;
|
| 11 | +import java.util.Calendar; |
| 12 | +import java.util.Date; |
11 | 13 | import java.util.List;
|
12 | 14 | import java.util.Scanner;
|
13 | 15 | import com.google.gson.Gson;
|
14 | 16 | import java.io.PrintWriter;
|
| 17 | +import java.text.DateFormat; |
| 18 | +import java.time.Year; |
15 | 19 |
|
16 | 20 | /* Created by Keith Whitley */
|
17 | 21 |
|
@@ -153,15 +157,15 @@ public List<Schedule> parseSchedules(String scheduleFolderPath, String staff_dir
|
153 | 157 | }
|
154 | 158 | }
|
155 | 159 | Leads leads = this.parseLeads(leadsFile, staff);
|
156 |
| - schedules.add(new Schedule(staff, week, leads, |
157 |
| - scheduleJson.getName().substring(9, scheduleJson.getName().length()).split("\\.")[0])); // grab |
158 |
| - // just |
159 |
| - // the |
160 |
| - // date |
161 |
| - // portion |
162 |
| - // of |
163 |
| - // file |
164 |
| - // name |
| 160 | + String scheduleDateRange = scheduleJson.getName().substring(9, scheduleJson.getName().length()).split("\\.")[0]; // grab just date of file name |
| 161 | + // need to -1 on month field because it is zero indexed |
| 162 | + // https://stackoverflow.com/questions/45996752/calendar-getcalendar-year-returns-wrong-year |
| 163 | + Date startDate = new Date(Year.now().getValue() - 1900, Integer.parseInt(scheduleDateRange.substring(0, 2)) - 1, Integer.parseInt(scheduleDateRange.substring(3, 5))); |
| 164 | + Date endDate = new Date(Year.now().getValue() - 1900, Integer.parseInt(scheduleDateRange.substring(6, 8)) - 1, Integer.parseInt(scheduleDateRange.substring(9, 11))); |
| 165 | + if (!new Date().after(endDate)) { // new date is current date time |
| 166 | + schedules.add(new Schedule(staff, week, leads, scheduleDateRange)); |
| 167 | + } |
| 168 | + |
165 | 169 | }
|
166 | 170 |
|
167 | 171 | if (schedules.size() == 0) {
|
|
0 commit comments