Skip to content
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.

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

OrderList and ScheduleList fxml #73

Merged

Conversation

yeodonghan
Copy link

Added fxml for OrderListCard, OrderListPanel, ScheduleListCard and ScheduleListPanel.

@yeodonghan yeodonghan changed the title Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T09-4/ma… OrderList and ScheduleList fxml Oct 1, 2019
Copy link

@EugeneTeu EugeneTeu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

overall good job

<Label fx:id="orderId" styleClass="cell_small_label" text="\$orderId" />
<Label fx:id="customerName" styleClass="cell_small_label" text="\$customerName" />
<Label fx:id="phoneName" styleClass="cell_small_label" text="\$phoneName" />
<Label fx:id="phoneColour" styleClass="cell_small_label" text="\$phoneColour" />

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@uberSaiyan @qiujiaaa @zhixianggg Order for Model does not have Colour and Capacity but should we add it in? or we just use the phone in that order to access instead ?

I think we should stick with the latter as no phone means no order

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can just use the phone to access i think!

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think accessing through phone is fine

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay stick with phone. Issue close

src/main/resources/view/ScheduleListCard.fxml Show resolved Hide resolved
Copy link

@qiujiaaa qiujiaaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

overall good job!

<Label fx:id="orderId" styleClass="cell_small_label" text="\$orderId" />
<Label fx:id="customerName" styleClass="cell_small_label" text="\$customerName" />
<Label fx:id="phoneName" styleClass="cell_small_label" text="\$phoneName" />
<Label fx:id="phoneColour" styleClass="cell_small_label" text="\$phoneColour" />
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think accessing through phone is fine

src/main/resources/view/ScheduleListCard.fxml Show resolved Hide resolved
src/main/resources/view/ScheduleListCard.fxml Show resolved Hide resolved
Copy link

@yan-wl yan-wl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job!

Copy link

@zhixianggg zhixianggg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's okay!

@EugeneTeu EugeneTeu merged commit eed2963 into AY1920S1-CS2103T-T09-4:master Oct 3, 2019
@EugeneTeu EugeneTeu added this to the v1.2 milestone Oct 9, 2019
@EugeneTeu EugeneTeu added the priority.High Must do label Oct 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants