From 2b5fbc522b9c33f16590f7e240deb576e81e1261 Mon Sep 17 00:00:00 2001 From: jinbesan Date: Mon, 10 Apr 2023 22:38:33 +0800 Subject: [PATCH] Fix grammar in user guide --- docs/UserGuide.md | 60 ++++++++++++++++++--------------- docs/images/fasttrack_logo.png | Bin 0 -> 8358 bytes 2 files changed, 32 insertions(+), 28 deletions(-) create mode 100644 docs/images/fasttrack_logo.png diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 0c30b7f0431..df3d6dfcc1e 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -1,6 +1,8 @@ --- layout: page title: FastTrack User Guide + +![FastTrack logo](images/fasttrack_logo.png) --- @@ -541,6 +543,8 @@ Format: `delete INDEX` 3. FastTrack deletes the second expense in the expense list with the confirmation message `Deleted expense: Name: milk, Amount: $4.5, Date: 2023-04-07, Category: groceries`. +![FastTrack delete](images/demo/expense/delete.png) + ## **Editing an expense** `edexp` Edits the expense at the specified `INDEX` in the expense list. @@ -693,7 +697,7 @@ Format: `delrec INDEX`
:information_source: Automatic Deletion of Recurring Expenses: -If a recurring expense's end date has already passed, and the current date too is already past the end date, FastTrack automatically deletes the recurring expense the next time the application is started. This means you do not need to worry about manually deleting recurring expenses which are no longer applicable! +If a recurring expense's end date has already passed, FastTrack automatically deletes the recurring expense the next time the application is started. This means you do not need to worry about manually deleting recurring expenses which are no longer applicable!
@@ -733,7 +737,7 @@ to `INDEX`, otherwise the command will not go through.
**:exclamation: Caution**
-If you want to stop a recurring expense before its intended `END_DATE`, make sure to terminate it before the current date. +If you want to stop a recurring expense before its intended `END_DATE`, make sure to delete it before the current date. If you edit the recurring expense to end before the current date, this only prevents new expenses from being added, but expenses that were previously generated will still exist in FastTrack.
@@ -742,8 +746,8 @@ If you edit the recurring expense to end before the current date, this only prev * `edrec 2 p/4.50 ed/15/5/2023` updates the price and ending date of the second recurring expense in the expense tracker. ### Demonstration -1. Enter the command `lrec` to switch to the **Recurring Expense Display** -2. Say you have upgraded to a Netflix yearly subscription plan - enter the command `edrec 2 p/200 t/year` +1. Enter the command `lrec` to switch to the **Recurring Expense Display**. +2. Say you have upgraded to a Netflix yearly subscription plan - enter the command `edrec 2 p/200 t/year` . 3. FastTrack edits the second recurring expense in the recurring expense list with the confirmation message `Edited recurring expense generator: Recurring Expense: Netflix, Amount: 200.0, Category: entertainment, Start Date: 2023-01-20, End Date: Ongoing, Recurring Expense Type: YEARLY`. ![FastTrack edrec1](images/demo/recurring_expense/edrec1.png) @@ -774,7 +778,7 @@ If you edit the recurring expense to end before the current date, this only prev ## **Setting A Budget** `set` -Sets a monthly budget for FastTrack. For first-time users of FastTrack, no budget is set and some expense statistics are not updated. +Sets a monthly budget for FastTrack. For first-time users of FastTrack, no budget is set and expense statistics are not updated. In order to view all the expense statistics, you must first set a budget using this command. @@ -791,16 +795,16 @@ Format `set p/AMOUNT` **:exclamation: Caution**
-FastTrack does not allow setting a budget of $0 +FastTrack does not allow setting a budget of $0. ### Examples -* `set p/500` sets the monthly budget of FastTrack to $500 +* `set p/500` sets the monthly budget of FastTrack to $500. ### Demonstration -1. Enter the command `set p/500` to set the monthly budget of FastTrack to $500 +1. Enter the command `set p/500` to set the monthly budget of FastTrack to $500. 2. FastTrack updates the monthly budget to $500 with the confirmation message `Monthly budget successfully set to $500.0` ![FastTrack set](images/demo/general/set.png) @@ -831,25 +835,25 @@ Narrow down the list of suggested categories by typing the first few words of yo **:exclamation: Caution**
To use category autocompletion, make sure that `c/` is the last text you've entered into the command box. -If there's any other text in front of `c/`, the autocompletion feature will be disabled. +If there is any other text in front of `c/`, the autocompletion feature will be disabled. ### Demonstration -1. Enter `list c/` into the command box -2. A list of suggested categories appear in a popup above the command box +1. Enter `list c/` into the command box. +2. A list of suggested categories appear in a popup above the command box. 3. Navigate into the suggestion list using the `UP` arrow key and press `ENTER` on the desired category `Transportation`. -4. This autocompletes the category name -5. If you need to navigate out of the suggestion list, press the `DOWN` arrow key until the cursor returns to the command box +4. This autocompletes the category name. +5. If you need to navigate out of the suggestion list, press the `DOWN` arrow key until the cursor returns to the command box. ![FastTrack autocomplete_a1](images/demo/general/autocomplete_a1.png) ![FastTrack autocomplete_a2](images/demo/general/autocomplete_a2.png) -1. Enter `list c/` into the command box -2. A list of suggested categories appear in a popup above the command box +1. Enter `list c/` into the command box. +2. A list of suggested categories appear in a popup above the command box. 3. If the desired category `Shopping` is the first suggestion in the list (the bottom-most suggestion), press `TAB` within the command box. -4. This autocompletes the category name +4. This autocompletes the category name. ![FastTrack autocomplete_b1](images/demo/general/autocomplete_b1.png) ![FastTrack autocomplete_b2](images/demo/general/autocomplete_b2.png) @@ -864,14 +868,14 @@ Format: `CLEAR`
**:exclamation: Caution**
-This command will delete **all** the data stored in FastTrack apart from the stored monthly budget. To minimise the risk of accidentally using this command, we have made it such that the command only works when the `CLEAR` is fully uppercase. +This command will delete **all** the data stored in FastTrack apart from the stored monthly budget. To minimise the risk of accidentally using this command, we have made it such that the command only works when the word `CLEAR` is fully uppercase. Exercise caution before using this command.
### Demonstration -1. Enter `CLEAR` in the command box +1. Enter `CLEAR` in the command box. 2. FastTrack clears all previously logged expenses, recurring expenses and categories, with the confirmation message `Deleted all prior entries`. ![FastTrack clear](images/demo/general/clear.png) @@ -905,37 +909,37 @@ Here are the types of statistics displayed and what they mean. ## Monthly spending statistic -This statistic represents the total amount of money you have spent in the current month. +This statistic represents the **total amount of money you have spent** in the **current month**. It includes all expenses recorded in the current month. For example, if the current month is March, this statistic shows the total amount of money spent in March. ## Monthly remaining statistic -This statistic represents the amount of money you have left from your monthly budget. +This statistic represents the **amount of money you have left** from your **monthly** budget. It gives you an idea of how much money you have left to spend for the rest of the month. ## Monthly percentage change statistic -This statistic represents the percentage increase or decrease in your monthly spending relative to the previous month. -The indicator colour is red if it is a percentage increase and green if it is a percentage decrease. +This statistic represents the percentage **increase** or **decrease** in your **monthly** spending relative to the previous month. +The indicator colour is **red** if it is a percentage increase and **green** if it is a percentage decrease. For example, if you spent $500 last month and $750 this month, the monthly percentage change indicator would be `+50.00%` and be displayed in a red colour. If you spent $750 last month and $500 this month, the monthly percentage change would be `-33.30%` and be displayed in a green color. ## Weekly spending statistic -This statistic represents the total amount of money you have spent in the current week, starting from Monday to Sunday. +This statistic represents the **total amount of money you have spent** in the **current week**, starting from Monday to Sunday. This gives you an idea of how much money you are spending on a weekly basis. ## Weekly remaining statistic -This statistic represents the amount of money you have left from your weekly budget. +This statistic represents the **amount of money you have left** from your **weekly** budget. Your weekly budget is the value of your monthly budget divided by four. This gives you an idea of how much money you have left to spend for the rest of the week.
:exclamation: **Caution:** -Please take note that this value should be treated as a rough guide. +Please take note that this value should be treated as a rough guide.
Even if you have exceeded your previous week's budget, this statistic will show that you have more remaining, as the weekly budget is fixed based on the monthly budget. Therefore, it is important to use this value as an estimate and not solely rely on it for your spending decisions! @@ -944,15 +948,15 @@ Therefore, it is important to use this value as an estimate and not solely rely ## Weekly percentage change statistic -This statistic represents the percentage increase or decrease in your weekly spending relative to the previous week. -The indicator colour is red if it is a percentage increase and green if it is a percentage decrease. +This statistic represents the percentage **increase** or **decrease** in your **weekly** spending relative to the previous week. +The indicator colour is **red** if it is a percentage increase and **green** if it is a percentage decrease. For example, if you spent $500 last week and $750 this week, the weekly percentage change indicator would be `+50.00%` and be displayed in a red colour. If you spent $750 last week and $500 this week, the weekly percentage change would be `-33.30%`. ## Total spent statistic -This statistic represents the total amount of money you have spent to date, starting from the first expense you recorded in FastTrack. +This statistic represents the **total amount of money you have spent to date**, starting from the first expense you recorded in FastTrack. This gives you an idea of how much money you have spent over the period of time from when you started tracking your expenses. diff --git a/docs/images/fasttrack_logo.png b/docs/images/fasttrack_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..5b1d7175f8dd8ccf9471e888064ae3260135204f GIT binary patch literal 8358 zcmeHM`#;oa`~N6OQYkB^qS97!+{DNsk)_t5!VELUkQ|1=2%&M@Bnf$*t&phXL5y*n zaoicyQX4|dj2woN)J)@$9p{;O?vLF+;Q4-k-0g>X&F6C;uKRtxuj{@(_jTQ==N)ag z$*9Oc5VY;=8EYp9+K2(aQ_@nP<=D)gOWhYH4VUwO%nkN#HqlJapfM%tZesaOVc5wag{GY~_moeS8r;zE z!Yic69C5y-`TDA7piOZ={I)5J53yK9{oMU0BKM>jEzJvmT^v4=o?lc{#A*zm`uND~ zY8ZW({~Do^vCQZ5XIMSVY@RKFJ?y>-N(>m7Hm_V%D_VJ5H5z1OL4L@NspR$4o8~(< z>!VbX4f+CUA6r(qWRzZUyxT*me!i9d2z^)($2kWpeARUUikDG81s zpvs?eGQ{l#>jg5F5^0iu&nmB1rZjUyNJt2$94BfZX)6LgTYa8BCluYP$mIF6V|=A4 z`v>f_>gww~$qdcx&i;lCP~zEor-zQsqJ2${j`(d)A7bN{C$ot+wIImvR9rBd;{C=@ zzu<~2y#Z6f_?>g)y$qE2)Mc&f zytN8VcH4EeNTq z8mmb|&~rJgxq&KX1K`Z2*uy-8LZQ$-{RZrBu$W}mvE6PEq#tHr`YyM$w`>E?MxZKe zey^epLBn0(C5fhrREV zmX<~g3Jw+)-J9;CI|ch4=dHGfc$*Kvkt$T%B}<}RhOo;`a; zU=nTObh0#eLy&zP>i#c;`a?!kZpO8#o=4*Bqc!pFanS`}GxU2gNFxmqpWnn9x-5%% zJYME2$=sKPN%X>N2}eWBWWk7XM&F#)o#?w&=tK5#E>*Y6&!xQtW(;uM;daski_L3T zeeXEX*TyBz&g@Z;gc9#NiNA=s^F0=xYA0it&fb@kzZ_A;P$Ptg&lh@=_d!rsP3qg9 zj28+fNdU7~c4|Wip}evWU)EIis2~ zXj0p|3k`UGI#7M(^P8g0$RJ^3-p>YGD4gz_V_;#ZaGpEanLVtks+yo#Qhvb^t$=2e zU#?I=S2|~9WMo8ZaeCBUr{t5%X+l6iDU%;5cA*C;0LcB-9Q<({H^PJ;_EYZU-J5`s z@$@dX&Kt0)J2g+xddozaLdJS?5Y-5QusB-s!6obBA4akqFck7HfdMV2>`)iA9P`%L zL0Ko{>;I0zPqnBpiJ+eFV<KYr z-o0NkhOL2j>Zd-jmDaG`9OEuE2CH;OEAo2ir^2KBxuqGqASKI-ZoC6s)6ZafTYMmVMPg79}XmyxjO=sHc^Uf6c z6ckaSLjYrn%c{iDNrid6siz5p&o;t3fr(L**Bz-GI-Mc(uK|k!gQ{xzo;r-V zQQgqsrq_yx1%8fva%E`ipy92)_)}jYqBBt{7vJsr`jLe=U?-rk^@~z; znPIOr?^*Iz0V@LqBiy_391VW+n2}n3KMxdYwqAJ856-<^Fm>Ju-W+7hg znS9O(#pBV}0NB~!a}Ui?$ppB zWjxm8$Wtw#QK?j{dAA~vbeq6nJN3kBP@6`lVSBfpTBsY~6ed;lfET3^1SXJ(zmEq1 zWJAPosI(GpV*9VZiiT)}9&a8RZ}^~ledSaTuXPqZEw)lZ>Q|q`vQm$$WcWKUM+9fr z=j8QHcPBMxUzFAXTHa~q1kxfGa9^&Yh&$mU$>}97xe_CocZ6Ao?eBF2Q2JKcTX34t z2>SK!imqUU1S-QFyeOf_qN2uC;EvFZn%ehtbxhVp@GML8=XqWFD`>zbR>BnaE#b`j z0)Y!a2VUo!BF4b3cnF6f>j5p!gXsbg%>LESkDTK59_s^`rAt*i4PlDWW5K9PItVQQ zO}bQtm+S`+?JMrXua%fkv4vokoRb3;V+B~<*VShU6w-I!42INT4#Bf8u6NkO#9iM4 ztE&$$BzFi7a?h^APL|UPuO|O(@HaNT`NqC~(oU&r+yI$dEdPG))jcg&nY;xaDtrM1biA(=Q}L4A0>#cz9WeCB5)w^7_{wp*MH7FVK_~XVazO;Tzqi( z#)of${91bwMDt(2cIqkG%ph8p9U5a6 zLnLy1t+poKpM9UEH*Kaw*K)1+E)hNTKN9!xB*xjBe^^XE|LVQE7@Q>%YyF=54L**8 zScydC*>@@GFeS}VGrJSfhpAA`7TDoH*}_pGv48x3r0Cl*;cs_nB53RCMuNj4^uxFF z;kN_uw{!sdM;-b8A18cN3aS}|i+{Z_T2D*Y6Gb%d_I8jpN`eGAzZU~1vA-QB50TD; zhcf}DCZIa|F9EuCm~R3<$~hrWaS`X&Q_wuqsEX0puOEI7gtJ)hn3xzknwgaf=b?_x z7sO2s4NEi3{#elIb%a15Wcba{NW8Y}VqNdtX z1)SmEc5$dhndCdh%uGGl{Oj8}OQ4U&7Y`nXZ8k2fheLeI(9BBt5Tk&p8b|pKyl<~* z8mn#_vXs|Z7qI<;VLv5_5$T0DC;jnB2oqq5+P?Da=K|l=ec(m3eaL8#ZT4lybYycq ztbR;f=%Au%O59~em}qUeg{cQGLR%Ob8d}^Q^SnTw!kKG3ZMO|5oi*@6DwA|>{wX4e zNE`#zZ|Dzt%z)}`S<33-OyzF7A3)1(?6tlqAG|>1W4l`wEGKKsDne$2*@KF^z$tyb z@aABv+xE$nWlerj76qjGZ3}xdGbpb^=77VRa^#l)6n{{jLSn`sLyG~OtzF6y#P;gL z7(-`J>F|=;cD%c6TUbUG>_PfzQX!9jKJ-`D4OuhLb-b_aKJ16J@Bg#-om%u0<`e^# za@Vx)IN4~{np`=|XCML4;(@azXw!rsWh+DGinD-5|g)Dl4 z)4MGPjCQ9q3lF)MRi@T)btKMMH zp7jA|nk6%37us)cUtrow>v=MMMbUq~09NU63+x=n&GnWct7%-D4!}oFGp(*}VffgF zxx%D4x~eklTCGa~p1(%VCBQ z+PCGIJBO@6;7K1@SXi)IoEh`fDZzi})L&Qu*@G##y1|igoFf2_hKoZDP7IO<5hbt2 zc?ShUlz*4Rog{-Kz)O<5Eh*n|N*E^f`XDuMhx*C2aKpD{nYy|ljwC+D`OuwTzr3G} zqT~iqZUWf*K9_5dBZ~`=^6ns(y)w2&@w-lw57ogjCd1B$*>Qjx=naSicNe$HhX${s z9D;ynB&pQDECZJu%->)aO{@p?-gx(pu0bGI(fyGE!VsvwP>*w{5fK#7Vob;R!u0Co z7c$B*@04kNUMePZu0ZPtyL=0Uq7@UK!}o9jU94d%f^lj033h zSDyT7X(YTSP9K4Ysy53H0b2J@vOq~XVQ#TSOm{xiYwbvlBp16Q$e&rm?Gb>ZV#_#} zSxVroE6w&*slX~TN8Zh({Rm60=2EUP`+0YwT|z5M0WA35gj_;uGV}yIpRLB3b3EML zV_NJ}OJyjzp8==#w*zv$`9@a?m{UW*N=gK0MEg+if%@%gFFHCp;OifY3Yq0(?sFcn zxssy5rtJ}2hcB`(EzQUCS*DIl7j}Z}9_mMWAvwm6FwydT)oqOzoNxs0<^RM(xJSfN z^o*TLIi}%vl)54bd?WAH%0svMvMnrA-;OR2-2|+*mJ4vlLB1p_d8;Ca2;YiGbw}U@ z_d~%o=x<${QIC3uegx00snpJXhimoz=2a`;MwB~V_7F#YvR-pu%`MWomb43#@|69| z_1uh0n_$BG6@W}5c?;UWO%*?8ahkGw;d|=s-|udP649u0mEfC2jGHnYLti$V#aj_h z(KXp&3Rpp%72=c>?rA0;A3%+AXzi!^m zUYWOspH~8eSabMpI=zMDL~}AfS#79qi_bWtfV&dmG2_t8)wuBtEPDC;7%z~vqAZwL zdE3$2Cxra|DsUJp zQ|n}=jOm