Skip to content

assignment-dev-08-FE-refactor : FE code refactor #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yennanliu wants to merge 11 commits into
base: main
Choose a base branch
from
Open

assignment-dev-08-FE-refactor : FE code refactor #107

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
72b2f54
add Order bean, mapper, service, impl, controller
yennanliu Oct 13, 2023
ef08d87
add order html, fix order id strategy, fix mapper, update url in main…
yennanliu Oct 13, 2023
d73644e
fix order ddl, get productList, merchantList in order input, fix list…
yennanliu Oct 13, 2023
1337dd8
fix order update html, update orderController, update list order html
yennanliu Oct 13, 2023
1276485
add status to order bean, html, add amount default value, fix ddl
yennanliu Oct 14, 2023
3c07754
add update productWithOrder, fix bean int type, update controller
yennanliu Oct 14, 2023
29d9c2b
add getProductDtoListFromProductList method
yennanliu Oct 14, 2023
b4ea5e6
fix ddl, modify createTime when new order, show createdTime]
yennanliu Oct 15, 2023
a5fb15c
fix product input status, show status, add enum, fix ddl
yennanliu Oct 15, 2023
508fc1c
update mapper, add csvUtil, update unit test
yennanliu Oct 15, 2023
399ea88
update saveAssignment method, progress, readme, remove log
yennanliu Oct 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
update saveAssignment method, progress, readme, remove log
  • Loading branch information
@yennanliu
yennanliu committed Oct 15, 2023
commit 399ea88258914346f6c77bfbabb2333e819b8dc4
1 change: 1 addition & 0 deletions springAssignmentSystem/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
- Part 30 : https://youtu.be/iYchh7v7P1Q?si=mDFJUFlhijuH83CN
- Part 31 : https://youtu.be/SOyfQCsOvO4?si=HsjKAdQBiflZHORp
- Part 32 : https://youtu.be/d_YH4TnLuhk?si=BmgFG1gWJvDLp5kO
- Part 33 : https://youtu.be/TbhJBqAiMGE?si=nIKaQMjUnpGcRjgw


- Spring JWT
Expand Down
6 changes: 5 additions & 1 deletion springAssignmentSystem/doc/progress.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,8 @@

- 20231012
- https://youtu.be/d_YH4TnLuhk?si=BmgFG1gWJvDLp5kO
- progress : 16:22
- progress : 16:22

- 20231015
- https://youtu.be/d_YH4TnLuhk?si=BmgFG1gWJvDLp5kO
- https://youtu.be/TbhJBqAiMGE?si=nIKaQMjUnpGcRjgw
19 changes: 15 additions & 4 deletions springAssignmentSystem/frontend/frontend_app/src/AssignmentView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,21 @@ const AssignmentView = () => {
console.log(assignment);
}

function saveAssignment() {
function saveAssignment(status) {
// call BE API save assignment
// https://youtu.be/2XRQzR4y2yM?si=aiNeLhS3SXsU18HE&t=833
// means when submit an assignment at the first time
if (assignment.status === assignmentStatuses[0].status) {
updateAssignment("status", assignmentStatuses[1].status);

// https://youtu.be/d_YH4TnLuhk?si=eYDtONFyA5U5hVZM&t=1134
// if (assignment.status === assignmentStatuses[0].status) {
// updateAssignment("status", assignmentStatuses[1].status);
// } else {
// // https://youtu.be/2XRQzR4y2yM?si=RDbtHpdUnVs8j7JE&t=1109
// persist();
// }

if (status && assignment.status != status) {
updateAssignment("status", status);
} else {
// https://youtu.be/2XRQzR4y2yM?si=RDbtHpdUnVs8j7JE&t=1109
persist();
Expand Down Expand Up @@ -216,7 +225,9 @@ const AssignmentView = () => {
</Col>
</Form.Group>

<Button onClick={() => saveAssignment()}>Submit Assignment</Button>
<Button onClick={() => saveAssignment("Submitted")}>
Submit Assignment
</Button>
</>
) : (
<></>
Expand Down
12 changes: 6 additions & 6 deletions springAssignmentSystem/frontend/frontend_app/src/CodeReviewAssignmentView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ const CodeReviewerAssignmentView = () => {
// means when submit an assignment at the first time
// https://youtu.be/SOyfQCsOvO4?si=Eu1z9CWZO0c-e3Zq&t=816

console.log(
"(saveAssignment) status = " +
status +
", assignment = " +
JSON.stringify(assignment)
);
// console.log(
// "(saveAssignment) status = " +
// status +
// ", assignment = " +
// JSON.stringify(assignment)
// );

if (status && assignment.status !== status) {
updateAssignment("status", status);
Expand Down