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

feature/ATC-205 #245

Closed
wants to merge 5 commits into from
Closed

feature/ATC-205 #245

wants to merge 5 commits into from

Conversation

Dabea
Copy link
Collaborator

@Dabea Dabea commented Dec 27, 2016

completes #205
This adds wip boolean to the AIRPORT_LOAD_LIST in airportLoadList.js.
Then adds this to the readback variable that is displayed

This could be done with out the flag variable and done in the string inline like
log: 'cleared to the ${airport.name}${airport.wip ? ' &#9983 ' : ''} via the ${routeModel.procedure} arrival',
however I think this is much cleaner.
'cleared to the ${airport.name}${flag} via the ${routeModel.procedure} arrival',

@Dabea Dabea added the refactor label Dec 27, 2016
@Dabea Dabea requested review from n8rzz and erikquinn December 27, 2016 09:45
Copy link
Owner

@n8rzz n8rzz left a comment

Choose a reason for hiding this comment

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

This is a good start, but you're missing the flag in the airport list.

Now that the flag has been removed from the name, you will need to add it manually from within the UiController when the airportList is built for the modal. Let me know if you have any questions on that.

Be sure to visually test this when you're all finished up. You should be able to see the flag next to an airport name (that is wip: true) in the airport modal.

@@ -1292,7 +1292,7 @@ export default class Aircraft {
const routeModel = new RouteModel(data[0]);
const airport = window.airportController.airport_get();
const { name: starName } = airport.starCollection.findRouteByIcao(routeModel.procedure);

let flag = airport.wip ? ' &#9983 ' : '';
Copy link
Owner

Choose a reason for hiding this comment

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

this can actually be removed. what we are trying to avoid is having the flag present within the readbacks, which is what we were getting before when the flag was present in the airport.name.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Ahh I see. I misunderstood the goal but now I understand.

log: `cleared to the ${airport.name} via the ${routeModel.procedure} arrival`,
say: `cleared to the ${airport.name} via the ${starName} arrival`
log: `cleared to the ${airport.name}${flag} via the ${routeModel.procedure} arrival`,
say: `cleared to the ${airport.name}${flag} via the ${starName} arrival`
Copy link
Owner

Choose a reason for hiding this comment

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

${flag} can be removed here as well. not needed for the readbacks.

@@ -14,7 +14,7 @@
### Minor
- Ensures proper removal of all `AircraftConflict` instances involving an aircraft that has been removed from the simulation [#133](https://github.com/n8rzz/atc/issues/133)
- Originally reported under [zlsa#734](https://github.com/zlsa/atc/issues/734)

- Changes the names from haveing the flags in their name by adding WIP variable to the `AIRPORT_LOAD_LIST` in `airportLoadList` [#205](https://github.com/n8rzz/atc/issues/205)
Copy link
Owner

Choose a reason for hiding this comment

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

having is spelled incorrectly and there are two spaces between name and by

@Dabea
Copy link
Collaborator Author

Dabea commented Jan 3, 2017

The flags now display in the aircraft list

@Dabea
Copy link
Collaborator Author

Dabea commented Jan 3, 2017

however it is not pushed yet

@Dabea
Copy link
Collaborator Author

Dabea commented Jan 10, 2017

Added Space after the flag and now this one should be complete

@n8rzz
Copy link
Owner

n8rzz commented Jan 23, 2017

completed under #181 ( PR #236 )

@n8rzz n8rzz closed this Jan 23, 2017
@n8rzz n8rzz deleted the feature/ATC-205 branch January 23, 2017 13:28
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.

2 participants