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.

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

Added: default buttons in dateTime modal #188

Merged
merged 4 commits into from
Feb 22, 2023
Merged

Added: default buttons in dateTime modal #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
93e02ca
Added: default buttons in dateTime modal
disha1202 Feb 22, 2023
f2e6147
Merge branch 'main' of https://github.com/hotwax/threshold-management…
disha1202 Feb 22, 2023
a86e359
fix: conflicts(#85zrnvw06)
disha1202 Feb 22, 2023
5bf3cad
reverted: unwanted changes(#85zrnvw06)
disha1202 Feb 22, 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
3 changes: 2 additions & 1 deletion src/components/JobConfiguration.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<ion-modal :is-open="isOpen" @didDismiss="() => isOpen = false">
<ion-content force-overscroll="false">
<ion-datetime
show-default-buttons
hour-cycle="h12"
:value="job?.runTime ? getDateTime(job.runTime) : ''"
@ionChange="updateRunTime($event, job)"
Expand Down Expand Up @@ -371,7 +372,7 @@ ion-item:nth-child(2) > ion-label:nth-child(3) {

ion-modal {
--width: 290px;
--height: 390px;
--height: 440px;
--border-radius: 8px;
}
</style>
3 changes: 2 additions & 1 deletion src/views/ScheduleThreshold.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<!-- TODO: check why datetime component is not unmounted after scheduling the job -->
<!-- For now added a key with current time to re-render the component always when coming to the page -->
<ion-datetime
show-default-buttons
hour-cycle="h12"
:key="DateTime.now().toMillis()"
:value="initialRunTime ? getDateTime(initialRunTime) : ''"
Expand Down Expand Up @@ -679,7 +680,7 @@ ion-label:nth-child(3) {

ion-modal {
--width: 290px;
--height: 390px;
--height: 440px;
--border-radius: 8px;
}
</style>