Adding DONE to task status options #499
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <div class='latest-extension-info__content' data-test-extension-info-content> | ||
| <table class="latest-table"> | ||
| <tbody class="latest-table"> | ||
| <tr> | ||
| <th>Request : </th> | ||
| <td>{{#if (eq this.extension.requestNumber undefined)}} | ||
| #1 | ||
| {{else}} | ||
| #{{this.extension.requestNumber}} | ||
| {{/if}} | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <th >Reason : </th> | ||
| <td>{{this.extension.reason}}</td> | ||
| </tr> | ||
| <tr> | ||
| <th>Title : </th> | ||
| <td>{{this.extension.title}}</td> | ||
| </tr> | ||
| <tr> | ||
| <th>Old Ends On : </th> | ||
| <td>{{this.oldEndsOn}}</td> | ||
| </tr> | ||
| <tr> | ||
| <th>New Ends On : </th> | ||
| <td>{{this.newEndsOn}}</td> | ||
| </tr> | ||
| <tr> | ||
| <th>Status : </th> | ||
| <td>{{this.extension.status}}</td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| import Component from '@glimmer/component'; | ||
|
|
||
| export default class LatestExtensionInfoComponent extends Component { | ||
| extension = this.args.extension; | ||
| newEndsOn = this.localTime(this.extension.newEndsOn); | ||
| oldEndsOn = this.localTime(this.extension.oldEndsOn); | ||
|
|
||
| localTime(time) { | ||
| return new Date(time * 1000).toLocaleString(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| <div class='extension-form__container-parent'> | ||
| <div | ||
| role='button' | ||
| id='create' | ||
| class='extension-form__container-back' | ||
| data-test-extension-form-container-back | ||
| {{on 'click' @closeModel}} | ||
| ></div> | ||
| <div class='extension-form__container-main'> | ||
| <h2 data-test-title> | ||
| {{#if this.createExtensionRequest}} | ||
| Extension Request Form | ||
| {{else}} | ||
| Extension Details | ||
| {{/if}} | ||
| </h2> | ||
| {{#if this.createExtensionRequest}} | ||
| <div class='extension-form__content' data-test-extension-from-content> | ||
| <form {{on 'submit' this.submitExtensionRequest}}> | ||
| <label for='reason'>Reason</label> | ||
| <textarea | ||
| required | ||
| type='text-box' | ||
| id='reason' | ||
| name='reason' | ||
| data-test-extension-form-reason-input | ||
| ></textarea> | ||
| <p>Old ETA - {{this.oldETA}}</p> | ||
| <label for='newEndsOn'>New ETA</label> | ||
| <input | ||
| required | ||
| type='datetime-local' | ||
| id='newEndsOn' | ||
| name='newEndsOn' | ||
| {{on 'change' this.changeExtensionRequestETA}} | ||
| data-test-extension-form-newEndsOn-input | ||
| /> | ||
| <label for='title'>Title</label> | ||
| <textarea | ||
| required | ||
| type='text-box' | ||
| id='title' | ||
| name='title' | ||
| data-test-extension-form-title-input | ||
| ></textarea> | ||
| <div class='error-container' id='error'> | ||
| <span | ||
| class='error-placeholder' | ||
| data-test-extension-from-error | ||
| ></span> | ||
| </div> | ||
| <div class='buttons' id='form'> | ||
| <button | ||
| class='multiple-extension-form__container-close' | ||
| data-test-extension-form-container-close | ||
| type='button' | ||
| {{on 'click' @closeForm}} | ||
| > | ||
| Cancel | ||
| </button> | ||
|
|
||
| <button | ||
| class='multiple-extension-form__create-button primary-button-style' | ||
| disabled={{this.isSubmitButtonDisabled}} | ||
| type='submit' | ||
| >Submit</button> | ||
| </div> | ||
| </form> | ||
| </div> | ||
| {{else}} | ||
| <div class='extension-form__content' data-test-extension-from-content> | ||
| {{#if this.extensionData.value}} | ||
| <div class='extension-form__content-wrapper'> | ||
| {{#each this.extensionData.value as |extension|}} | ||
| <Task::LatestExtensionInfo @extension={{extension}} /> | ||
| {{#if extension.reviewedBy}} | ||
| <p data-reviewed-log>Your request was | ||
| {{#if | ||
| (eq extension.status 'APPROVED') | ||
| }}approved{{else}}denied{{/if}} | ||
| by | ||
| {{extension.reviewedBy}} | ||
| {{convertDate (array extension.timestamp) end_date=0}}. | ||
| </p> | ||
| {{/if}} | ||
| {{/each}} | ||
| </div> | ||
|
|
||
| <div class='buttons' id='detail'> | ||
| <button | ||
| class='multiple-extension-form__container-close' | ||
| data-test-extension-form-container-close | ||
| type='button' | ||
| {{on 'click' @closeForm}} | ||
| > | ||
| Close | ||
| </button> | ||
|
|
||
| {{#if | ||
| (or | ||
| (eq this.previousExtensionStatus 'APPROVED') | ||
| (eq this.previousExtensionStatus 'DENIED') | ||
| ) | ||
| }} | ||
| <button | ||
| class='multiple-extension-form__open-button primary-button-style' | ||
| data-test-create-another-extension | ||
| type='button' | ||
| {{on 'click' this.createNewExtensionRequest}} | ||
| > | ||
| Request Extension | ||
| </button> | ||
| {{/if}} | ||
| </div> | ||
| {{else if this.extensionData.isLoading}} | ||
| <div class='task-card__loader-container'> | ||
| <Spinner /> | ||
| </div> | ||
| {{else if this.extensionData.error}} | ||
| <h4>{{this.extensionData.error}}</h4> | ||
| <div class='buttons' id='create'> | ||
| <button | ||
| class='multiple-extension-form__container-close' | ||
| data-test-extension-form-container-close | ||
| type='button' | ||
| {{on 'click' @closeForm}} | ||
| > | ||
| Close | ||
| </button> | ||
| <button | ||
| class='multiple-extension-form__open-button primary-button-style' | ||
| data-test-create-extension-button | ||
| type='button' | ||
| {{on 'click' this.createNewExtensionRequest}} | ||
| > | ||
| Request Extension | ||
| </button> | ||
| </div> | ||
| {{/if}} | ||
| </div> | ||
| {{/if}} | ||
| </div> | ||
| </div> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of adding conditions inside a loop to populate the task status, can we just have two separate availableTaskStatusList?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You meant to maintain two seperate lists in the constants file itself?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. Something like that where we don't have to write extra logic to maintain the old flow.