From 8daa54792d5f40d77d1169e7d3fe2927a4a6ba7c Mon Sep 17 00:00:00 2001 From: weiyang Date: Sat, 11 Apr 2020 13:31:33 +0800 Subject: [PATCH 1/3] fix I/O --- text-ui-test/ACTUAL.TXT | 139 ++++++++++++++++++++++++++++---------- text-ui-test/EXPECTED.TXT | 139 ++++++++++++++++++++++++++++---------- text-ui-test/input.txt | 1 + 3 files changed, 209 insertions(+), 70 deletions(-) diff --git a/text-ui-test/ACTUAL.TXT b/text-ui-test/ACTUAL.TXT index 05541fed9..95629cbaa 100644 --- a/text-ui-test/ACTUAL.TXT +++ b/text-ui-test/ACTUAL.TXT @@ -4,7 +4,6 @@ \ /| Y \ ___/| | \| \ | | \/\ ___/\ ___/ \__/\ / |___| /\___ >___| /\___ / |__| \___ >\___ > \/ \/ \/ \/ \/ \/ \/ -There are no previous records, let's create a new one! ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -14,9 +13,10 @@ ________________________________________________________________________________ [meetings] List all scheduled meetings. [exit] Exit application. -Insert your own timetable by following: +Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -Added Tommy +Tommy already exists! +OOPS!! Repeated user ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -40,7 +40,8 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -Added Agnus +Agnus already exists! +OOPS!! Repeated user ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -148,6 +149,30 @@ Date: 5th 6th 7th 8th 9th 10th 11th 12th 13th 14th 15th 16th +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ | | | X | | X | | | | | | X | | X | | | 1800 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | | | | +1900 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2000 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2100 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2200 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2300 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | | | | +2400 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -169,13 +194,13 @@ Date: 5th 6th 7th 8th 9th 10th 11th +-----+-----+-----+-----+-----+-----+-----+ | | | X | | | | | 1000 +-----+-----+-----+-----+-----+-----+-----+ - | | | X | X | | | | + | | | X | X | X | | | +-----+-----+-----+-----+-----+-----+-----+ - | | | X | X | | | | + | | | X | X | X | | | 1100 +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | | | | + | | | X | | X | | | +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | | | | + | | | X | | X | | | 1200 +-----+-----+-----+-----+-----+-----+-----+ | | X | X | X | X | | | +-----+-----+-----+-----+-----+-----+-----+ @@ -201,14 +226,6 @@ Date: 5th 6th 7th 8th 9th 10th 11th +-----+-----+-----+-----+-----+-----+-----+ | | | X | | X | | | 1800 +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | - +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | -1900 +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | - +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | -2000 +-----+-----+-----+-----+-----+-----+-----+ [NOTE] You can type "more" for next week's timetable as well! ________________________________________________________________________________________________________________________________ [contacts] List all contacts. @@ -227,17 +244,17 @@ Timetable of the selected team member/s this week: Date: 5th 6th 7th 8th 9th 10th 11th 12th 13th 14th 15th 16th 17th 18th SUN MON TUE WED THU FRI SAT SUN MON TUE WED THU FRI SAT 0900 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | | | | | | X | X | | | | | + | | | X | | | | | | | | X | | | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | | | | | | X | X | | | | | + | | | X | | | | | | | | X | | | | | 1000 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | X | | | | | | X | X | X | | | | + | | | X | X | X | | | | | | X | X | X | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | X | | | | | | X | X | X | | | | + | | | X | X | X | | | | | | X | X | X | | | 1100 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | | | | | | X | X | | | | | + | | | X | | X | | | | | | X | | X | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | | | | | | X | X | | | | | + | | | X | | X | | | | | | X | | X | | | 1200 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ | | X | X | X | X | | | | | X | X | X | X | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ @@ -263,14 +280,30 @@ Date: 5th 6th 7th 8th 9th 10th 11th 12th 13th 14th 15th 16th +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ | | | X | | X | | | | | | X | | X | | | 1800 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | | | | | | | X | | + | | | | | | | | | | | | | | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | | | | | | | X | | + | | | | | | | | | | | | | | | | 1900 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | | | | | | | X | | + | | | | | | | | | | | | | X | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | | | | | | | X | | + | | | | | | | | | | | | | X | | | 2000 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2100 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2200 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2300 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | | | | +2400 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -390,10 +423,26 @@ Date: 5th 6th 7th 8th 9th 10th 11th 12th 13th 14th 15th 16th +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ | | | | | | X | | | | | | | | X | | 1900 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | | | | | | | X | | + | | | | | | X | | | | | | | X | X | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | | | | | | | X | | + | | | | | | X | | | | | | | X | X | | 2000 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2100 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2200 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2300 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | | | | +2400 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -408,8 +457,8 @@ ________________________________________________________________________________ ____________________________________________________________ Here are your stored contacts: 0) Tommy (main user) - 1) Patricia - 2) Agnus + 1) Agnus + 2) Patricia ____________________________________________________________ ________________________________________________________________________________________________________________________________ @@ -423,7 +472,8 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -There is no scheduled meetings so far. +The current scheduled meeting(s): +1. Thursday(16th) 19:00 to Thursday(16th) 23:30 (test_meeting2) ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -447,7 +497,7 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -You now have 1 meeting(s) in the list. +You now have 2 meeting(s) in the list. ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -459,7 +509,10 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -You now have 2 meeting(s) in the list. +Range entered is not within free slots. Check timetable. + +To schedule a meeting: +schedule ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -472,7 +525,7 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ I have removed: -1. Wednesday(15th) 19:00 to Wednesday(15th) 22:00 (test_meeting) +1. Thursday(16th) 19:00 to Thursday(16th) 23:30 (test_meeting2) ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -485,7 +538,23 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ The current scheduled meeting(s): -1. Thursday(16th) 19:00 to Thursday(16th) 23:30 (test_meeting2) +1. Wednesday(15th) 19:00 to Wednesday(15th) 22:00 (test_meeting) +________________________________________________________________________________________________________________________________ +[contacts] List all contacts. +[timetable] Display combined timetable of selected contacts. +[schedule] Schedule a new meeting. +[edit] Edit a contact's timetable. +[delete] Delete a scheduled meeting. +[meetings] List all scheduled meetings. +[exit] Exit application. + +Insert your member's timetable by following: +________________________________________________________________________________________________________________________________ +Slot entered is not of valid range. + +To edit a contact: +edit busy +edit free ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 05541fed9..95629cbaa 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -4,7 +4,6 @@ \ /| Y \ ___/| | \| \ | | \/\ ___/\ ___/ \__/\ / |___| /\___ >___| /\___ / |__| \___ >\___ > \/ \/ \/ \/ \/ \/ \/ -There are no previous records, let's create a new one! ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -14,9 +13,10 @@ ________________________________________________________________________________ [meetings] List all scheduled meetings. [exit] Exit application. -Insert your own timetable by following: +Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -Added Tommy +Tommy already exists! +OOPS!! Repeated user ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -40,7 +40,8 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -Added Agnus +Agnus already exists! +OOPS!! Repeated user ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -148,6 +149,30 @@ Date: 5th 6th 7th 8th 9th 10th 11th 12th 13th 14th 15th 16th +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ | | | X | | X | | | | | | X | | X | | | 1800 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | | | | +1900 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2000 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2100 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2200 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2300 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | | | | +2400 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -169,13 +194,13 @@ Date: 5th 6th 7th 8th 9th 10th 11th +-----+-----+-----+-----+-----+-----+-----+ | | | X | | | | | 1000 +-----+-----+-----+-----+-----+-----+-----+ - | | | X | X | | | | + | | | X | X | X | | | +-----+-----+-----+-----+-----+-----+-----+ - | | | X | X | | | | + | | | X | X | X | | | 1100 +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | | | | + | | | X | | X | | | +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | | | | + | | | X | | X | | | 1200 +-----+-----+-----+-----+-----+-----+-----+ | | X | X | X | X | | | +-----+-----+-----+-----+-----+-----+-----+ @@ -201,14 +226,6 @@ Date: 5th 6th 7th 8th 9th 10th 11th +-----+-----+-----+-----+-----+-----+-----+ | | | X | | X | | | 1800 +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | - +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | -1900 +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | - +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | -2000 +-----+-----+-----+-----+-----+-----+-----+ [NOTE] You can type "more" for next week's timetable as well! ________________________________________________________________________________________________________________________________ [contacts] List all contacts. @@ -227,17 +244,17 @@ Timetable of the selected team member/s this week: Date: 5th 6th 7th 8th 9th 10th 11th 12th 13th 14th 15th 16th 17th 18th SUN MON TUE WED THU FRI SAT SUN MON TUE WED THU FRI SAT 0900 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | | | | | | X | X | | | | | + | | | X | | | | | | | | X | | | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | | | | | | X | X | | | | | + | | | X | | | | | | | | X | | | | | 1000 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | X | | | | | | X | X | X | | | | + | | | X | X | X | | | | | | X | X | X | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | X | | | | | | X | X | X | | | | + | | | X | X | X | | | | | | X | X | X | | | 1100 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | | | | | | X | X | | | | | + | | | X | | X | | | | | | X | | X | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | | | | | | X | X | | | | | + | | | X | | X | | | | | | X | | X | | | 1200 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ | | X | X | X | X | | | | | X | X | X | X | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ @@ -263,14 +280,30 @@ Date: 5th 6th 7th 8th 9th 10th 11th 12th 13th 14th 15th 16th +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ | | | X | | X | | | | | | X | | X | | | 1800 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | | | | | | | X | | + | | | | | | | | | | | | | | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | | | | | | | X | | + | | | | | | | | | | | | | | | | 1900 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | | | | | | | X | | + | | | | | | | | | | | | | X | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | | | | | | | X | | + | | | | | | | | | | | | | X | | | 2000 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2100 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2200 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2300 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | | | | +2400 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -390,10 +423,26 @@ Date: 5th 6th 7th 8th 9th 10th 11th 12th 13th 14th 15th 16th +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ | | | | | | X | | | | | | | | X | | 1900 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | | | | | | | X | | + | | | | | | X | | | | | | | X | X | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | | | | | | | X | | + | | | | | | X | | | | | | | X | X | | 2000 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2100 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2200 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | +2300 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | X | | | + +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | | | | | | | | | | | +2400 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -408,8 +457,8 @@ ________________________________________________________________________________ ____________________________________________________________ Here are your stored contacts: 0) Tommy (main user) - 1) Patricia - 2) Agnus + 1) Agnus + 2) Patricia ____________________________________________________________ ________________________________________________________________________________________________________________________________ @@ -423,7 +472,8 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -There is no scheduled meetings so far. +The current scheduled meeting(s): +1. Thursday(16th) 19:00 to Thursday(16th) 23:30 (test_meeting2) ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -447,7 +497,7 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -You now have 1 meeting(s) in the list. +You now have 2 meeting(s) in the list. ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -459,7 +509,10 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -You now have 2 meeting(s) in the list. +Range entered is not within free slots. Check timetable. + +To schedule a meeting: +schedule ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -472,7 +525,7 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ I have removed: -1. Wednesday(15th) 19:00 to Wednesday(15th) 22:00 (test_meeting) +1. Thursday(16th) 19:00 to Thursday(16th) 23:30 (test_meeting2) ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -485,7 +538,23 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ The current scheduled meeting(s): -1. Thursday(16th) 19:00 to Thursday(16th) 23:30 (test_meeting2) +1. Wednesday(15th) 19:00 to Wednesday(15th) 22:00 (test_meeting) +________________________________________________________________________________________________________________________________ +[contacts] List all contacts. +[timetable] Display combined timetable of selected contacts. +[schedule] Schedule a new meeting. +[edit] Edit a contact's timetable. +[delete] Delete a scheduled meeting. +[meetings] List all scheduled meetings. +[exit] Exit application. + +Insert your member's timetable by following: +________________________________________________________________________________________________________________________________ +Slot entered is not of valid range. + +To edit a contact: +edit busy +edit free ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index ec2f50a61..ec10fc081 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -14,5 +14,6 @@ schedule test_meeting 15 19:00 15 22:00 schedule test_meeting2 16 19:00 16 23:30 delete 1 meetings +edit free 0 10 11:30 10 15:00 timetable exit \ No newline at end of file From 09c215ffa06d79d2c6f7155696dafd0de701d3a5 Mon Sep 17 00:00:00 2001 From: weiyang Date: Sat, 11 Apr 2020 13:34:21 +0800 Subject: [PATCH 2/3] fix I/O --- text-ui-test/ACTUAL.TXT | 123 +++++++++++--------------------------- text-ui-test/EXPECTED.TXT | 123 +++++++++++--------------------------- 2 files changed, 70 insertions(+), 176 deletions(-) diff --git a/text-ui-test/ACTUAL.TXT b/text-ui-test/ACTUAL.TXT index 95629cbaa..807adfce9 100644 --- a/text-ui-test/ACTUAL.TXT +++ b/text-ui-test/ACTUAL.TXT @@ -4,6 +4,7 @@ \ /| Y \ ___/| | \| \ | | \/\ ___/\ ___/ \__/\ / |___| /\___ >___| /\___ / |__| \___ >\___ > \/ \/ \/ \/ \/ \/ \/ +There are no previous records, let's create a new one! ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -13,10 +14,9 @@ ________________________________________________________________________________ [meetings] List all scheduled meetings. [exit] Exit application. -Insert your member's timetable by following: +Insert your own timetable by following: ________________________________________________________________________________________________________________________________ -Tommy already exists! -OOPS!! Repeated user +Added Tommy ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -40,8 +40,7 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -Agnus already exists! -OOPS!! Repeated user +Added Agnus ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -149,30 +148,6 @@ Date: 5th 6th 7th 8th 9th 10th 11th 12th 13th 14th 15th 16th +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ | | | X | | X | | | | | | X | | X | | | 1800 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | | | | -1900 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2000 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2100 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2200 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2300 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | | | | -2400 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -194,13 +169,13 @@ Date: 5th 6th 7th 8th 9th 10th 11th +-----+-----+-----+-----+-----+-----+-----+ | | | X | | | | | 1000 +-----+-----+-----+-----+-----+-----+-----+ - | | | X | X | X | | | + | | | X | X | | | | +-----+-----+-----+-----+-----+-----+-----+ - | | | X | X | X | | | + | | | X | X | | | | 1100 +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | X | | | + | | | X | | | | | +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | X | | | + | | | X | | | | | 1200 +-----+-----+-----+-----+-----+-----+-----+ | | X | X | X | X | | | +-----+-----+-----+-----+-----+-----+-----+ @@ -226,6 +201,14 @@ Date: 5th 6th 7th 8th 9th 10th 11th +-----+-----+-----+-----+-----+-----+-----+ | | | X | | X | | | 1800 +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | X | | + +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | X | | +1900 +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | X | | + +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | X | | +2000 +-----+-----+-----+-----+-----+-----+-----+ [NOTE] You can type "more" for next week's timetable as well! ________________________________________________________________________________________________________________________________ [contacts] List all contacts. @@ -244,17 +227,17 @@ Timetable of the selected team member/s this week: Date: 5th 6th 7th 8th 9th 10th 11th 12th 13th 14th 15th 16th 17th 18th SUN MON TUE WED THU FRI SAT SUN MON TUE WED THU FRI SAT 0900 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | | | | | | | X | | | | | + | | | X | | | | | | | X | X | | | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | | | | | | | X | | | | | + | | | X | | | | | | | X | X | | | | | 1000 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | X | X | | | | | | X | X | X | | | + | | | X | X | | | | | | X | X | X | | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | X | X | | | | | | X | X | X | | | + | | | X | X | | | | | | X | X | X | | | | 1100 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | X | | | | | | X | | X | | | + | | | X | | | | | | | X | X | | | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | X | | | | | | X | | X | | | + | | | X | | | | | | | X | X | | | | | 1200 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ | | X | X | X | X | | | | | X | X | X | X | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ @@ -280,30 +263,14 @@ Date: 5th 6th 7th 8th 9th 10th 11th 12th 13th 14th 15th 16th +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ | | | X | | X | | | | | | X | | X | | | 1800 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | | | | + | | | | | | X | | | | | | | | X | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | | | | + | | | | | | X | | | | | | | | X | | 1900 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | + | | | | | | X | | | | | | | | X | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | + | | | | | | X | | | | | | | | X | | 2000 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2100 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2200 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2300 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | | | | -2400 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -423,26 +390,10 @@ Date: 5th 6th 7th 8th 9th 10th 11th 12th 13th 14th 15th 16th +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ | | | | | | X | | | | | | | | X | | 1900 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | | | | | | X | X | | + | | | | | | X | | | | | | | | X | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | | | | | | X | X | | + | | | | | | X | | | | | | | | X | | 2000 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2100 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2200 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2300 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | | | | -2400 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -457,8 +408,8 @@ ________________________________________________________________________________ ____________________________________________________________ Here are your stored contacts: 0) Tommy (main user) - 1) Agnus - 2) Patricia + 1) Patricia + 2) Agnus ____________________________________________________________ ________________________________________________________________________________________________________________________________ @@ -472,8 +423,7 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -The current scheduled meeting(s): -1. Thursday(16th) 19:00 to Thursday(16th) 23:30 (test_meeting2) +There is no scheduled meetings so far. ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -497,7 +447,7 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -You now have 2 meeting(s) in the list. +You now have 1 meeting(s) in the list. ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -509,10 +459,7 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -Range entered is not within free slots. Check timetable. - -To schedule a meeting: -schedule +You now have 2 meeting(s) in the list. ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -525,7 +472,7 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ I have removed: -1. Thursday(16th) 19:00 to Thursday(16th) 23:30 (test_meeting2) +1. Wednesday(15th) 19:00 to Wednesday(15th) 22:00 (test_meeting) ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -538,7 +485,7 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ The current scheduled meeting(s): -1. Wednesday(15th) 19:00 to Wednesday(15th) 22:00 (test_meeting) +1. Thursday(16th) 19:00 to Thursday(16th) 23:30 (test_meeting2) ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 95629cbaa..807adfce9 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -4,6 +4,7 @@ \ /| Y \ ___/| | \| \ | | \/\ ___/\ ___/ \__/\ / |___| /\___ >___| /\___ / |__| \___ >\___ > \/ \/ \/ \/ \/ \/ \/ +There are no previous records, let's create a new one! ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -13,10 +14,9 @@ ________________________________________________________________________________ [meetings] List all scheduled meetings. [exit] Exit application. -Insert your member's timetable by following: +Insert your own timetable by following: ________________________________________________________________________________________________________________________________ -Tommy already exists! -OOPS!! Repeated user +Added Tommy ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -40,8 +40,7 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -Agnus already exists! -OOPS!! Repeated user +Added Agnus ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -149,30 +148,6 @@ Date: 5th 6th 7th 8th 9th 10th 11th 12th 13th 14th 15th 16th +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ | | | X | | X | | | | | | X | | X | | | 1800 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | | | | -1900 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2000 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2100 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2200 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2300 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | | | | -2400 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -194,13 +169,13 @@ Date: 5th 6th 7th 8th 9th 10th 11th +-----+-----+-----+-----+-----+-----+-----+ | | | X | | | | | 1000 +-----+-----+-----+-----+-----+-----+-----+ - | | | X | X | X | | | + | | | X | X | | | | +-----+-----+-----+-----+-----+-----+-----+ - | | | X | X | X | | | + | | | X | X | | | | 1100 +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | X | | | + | | | X | | | | | +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | X | | | + | | | X | | | | | 1200 +-----+-----+-----+-----+-----+-----+-----+ | | X | X | X | X | | | +-----+-----+-----+-----+-----+-----+-----+ @@ -226,6 +201,14 @@ Date: 5th 6th 7th 8th 9th 10th 11th +-----+-----+-----+-----+-----+-----+-----+ | | | X | | X | | | 1800 +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | X | | + +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | X | | +1900 +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | X | | + +-----+-----+-----+-----+-----+-----+-----+ + | | | | | | X | | +2000 +-----+-----+-----+-----+-----+-----+-----+ [NOTE] You can type "more" for next week's timetable as well! ________________________________________________________________________________________________________________________________ [contacts] List all contacts. @@ -244,17 +227,17 @@ Timetable of the selected team member/s this week: Date: 5th 6th 7th 8th 9th 10th 11th 12th 13th 14th 15th 16th 17th 18th SUN MON TUE WED THU FRI SAT SUN MON TUE WED THU FRI SAT 0900 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | | | | | | | X | | | | | + | | | X | | | | | | | X | X | | | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | | | | | | | X | | | | | + | | | X | | | | | | | X | X | | | | | 1000 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | X | X | | | | | | X | X | X | | | + | | | X | X | | | | | | X | X | X | | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | X | X | | | | | | X | X | X | | | + | | | X | X | | | | | | X | X | X | | | | 1100 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | X | | | | | | X | | X | | | + | | | X | | | | | | | X | X | | | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | X | | X | | | | | | X | | X | | | + | | | X | | | | | | | X | X | | | | | 1200 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ | | X | X | X | X | | | | | X | X | X | X | | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ @@ -280,30 +263,14 @@ Date: 5th 6th 7th 8th 9th 10th 11th 12th 13th 14th 15th 16th +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ | | | X | | X | | | | | | X | | X | | | 1800 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | | | | + | | | | | | X | | | | | | | | X | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | | | | + | | | | | | X | | | | | | | | X | | 1900 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | + | | | | | | X | | | | | | | | X | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | + | | | | | | X | | | | | | | | X | | 2000 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2100 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2200 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2300 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | | | | -2400 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -423,26 +390,10 @@ Date: 5th 6th 7th 8th 9th 10th 11th 12th 13th 14th 15th 16th +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ | | | | | | X | | | | | | | | X | | 1900 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | | | | | | X | X | | + | | | | | | X | | | | | | | | X | | +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | X | | | | | | | X | X | | + | | | | | | X | | | | | | | | X | | 2000 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2100 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2200 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | -2300 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | X | | | - +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ - | | | | | | | | | | | | | | | | -2400 +-----+-----+-----+-----+-----+-----+-----+ +-----+-----+-----+-----+-----+-----+-----+ ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -457,8 +408,8 @@ ________________________________________________________________________________ ____________________________________________________________ Here are your stored contacts: 0) Tommy (main user) - 1) Agnus - 2) Patricia + 1) Patricia + 2) Agnus ____________________________________________________________ ________________________________________________________________________________________________________________________________ @@ -472,8 +423,7 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -The current scheduled meeting(s): -1. Thursday(16th) 19:00 to Thursday(16th) 23:30 (test_meeting2) +There is no scheduled meetings so far. ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -497,7 +447,7 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -You now have 2 meeting(s) in the list. +You now have 1 meeting(s) in the list. ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -509,10 +459,7 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ -Range entered is not within free slots. Check timetable. - -To schedule a meeting: -schedule +You now have 2 meeting(s) in the list. ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -525,7 +472,7 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ I have removed: -1. Thursday(16th) 19:00 to Thursday(16th) 23:30 (test_meeting2) +1. Wednesday(15th) 19:00 to Wednesday(15th) 22:00 (test_meeting) ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. @@ -538,7 +485,7 @@ ________________________________________________________________________________ Insert your member's timetable by following: ________________________________________________________________________________________________________________________________ The current scheduled meeting(s): -1. Wednesday(15th) 19:00 to Wednesday(15th) 22:00 (test_meeting) +1. Thursday(16th) 19:00 to Thursday(16th) 23:30 (test_meeting2) ________________________________________________________________________________________________________________________________ [contacts] List all contacts. [timetable] Display combined timetable of selected contacts. From 8f91b337a8f0248d44535a78364b8a98c497b99a Mon Sep 17 00:00:00 2001 From: weiyang Date: Sat, 11 Apr 2020 13:36:35 +0800 Subject: [PATCH 3/3] Update gitignore ACTUAL.txt to ACTUAL.TXT --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 537c42d11..92a7be86c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ src/main/resources/docs/ *.iml bin/ -/text-ui-test/ACTUAL.txt +/text-ui-test/ACTUAL.TXT /text-ui-test/data/ # model.storage.model.storage /data