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

Allow setting default value for date/time picker in Dialog Editor modal #373

Merged
merged 4 commits into from
Sep 12, 2019
Merged

Allow setting default value for date/time picker in Dialog Editor modal #373

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
5d43974
Allow setting default value for date/time picker in Dialog Editor modal
romanblanco Mar 7, 2019
4750ab0
Add a button to clear default value
romanblanco Mar 29, 2019
e324336
Replaced pf-datepicker component for uib-datepicker
romanblanco Sep 9, 2019
e6f5aae
Added missing option to set field as required
romanblanco Sep 11, 2019
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
37 changes: 29 additions & 8 deletions src/dialog-editor/components/field/field.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,38 @@
type="checkbox">

<!-- date control -->
<input ng-switch-when="DialogFieldDateControl"
pf-datepicker options="vm.fieldData.options"
ng-disabled="true"
date="vm.fieldData.default_value">

<p class="input-group" ng-switch-when="DialogFieldDateControl">
<input uib-datepicker-popup="MM/dd/yyyy"
type="text"
class="form-control"
ng-model="vm.fieldData.default_value"
is-open="open"
close-text="{{'Close'|translate}}"/>
<span class="input-group-btn">
<button type="button"
class="btn btn-default"
ng-click="open = !open">
<i class="fa fa-calendar"></i>
</button>
</span>
</p>
<!-- date time control -->
<div ng-switch-when="DialogFieldDateTimeControl">
<div class="col-sm-6 dateTimePadding">
<input ng-model="vm.fieldData.default_value"
pf-datepicker options="vm.fieldData.dateOptions"
Copy link
Contributor

Choose a reason for hiding this comment

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

dateOptions is intentionally removed? (I'm not seeing it defined anywhere, so sounds about right, just checking :), line 33 does have datepicker-options, line 53 doesn't)

Copy link
Member Author

Choose a reason for hiding this comment

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

dateOptions is intentionally removed?

yes.

line 33 does have datepicker-options

Thanks! Removing 👍

date="vm.fieldData.default_value">
<p class="input-group">
<input uib-datepicker-popup="MM/dd/yyyy"
type="text"
class="form-control"
ng-model="vm.fieldData.default_value"
is-open="open"
close-text="{{'Close'|translate}}"/>
<span class="input-group-btn">
<button type="button"
class="btn btn-default"
ng-click="open = !open">
<i class="fa fa-calendar"></i></button>
</span>
</p>
</div>
<div class="col-sm-6">
<uib-timepicker ng-model="vm.fieldData.default_value"></uib-timepicker>
Expand Down
115 changes: 115 additions & 0 deletions src/dialog-editor/components/modal-field-template/date-control.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
<div ng-if="vm.modalTabIsSet('options') && !vm.modalData.dynamic">
<form class="form-horizontal">
<div pf-form-group pf-label="{{'Required'|translate}}">
<input bs-switch
ng-model="vm.modalData.required"
type="checkbox"
switch-on-text="{{'Yes'|translate}}"
switch-off-text="{{'No'|translate}}">
</div>
<div pf-form-group pf-label="{{'Default value'|translate}}">
<div class="dateTimePadding">
<p class="input-group">
<input uib-datepicker-popup="MM/dd/yyyy"
type="text"
class="form-control"
ng-model="vm.modalData.default_value"
is-open="open"
close-text="{{'Close'|translate}}"/>
<span class="input-group-btn">
<button type="button"
class="btn btn-default"
ng-click="open = !open">
<i class="fa fa-calendar"></i>
</button>
</span>
</p>
</div>
</div>
<div pf-form-group pf-label="{{'Read only'|translate}}">
<input bs-switch
ng-model="vm.modalData.read_only"
type="checkbox"
switch-on-text="{{'Yes'|translate}}"
switch-off-text="{{'No'|translate}}">
</div>
<div pf-form-group pf-label="{{'Visible'|translate}}">
<input bs-switch
ng-model="vm.modalData.visible"
type="checkbox"
switch-on-text="{{'Yes'|translate}}"
switch-off-text="{{'No'|translate}}">
</div>
<div pf-form-group pf-label="{{'Show Past Dates'|translate}}">
<input bs-switch
ng-model="vm.modalData.options.show_past_dates"
type="checkbox"
switch-on-text="{{'Yes'|translate}}"
switch-off-text="{{'No'|translate}}">
</div>
<dialog-editor-modal-field-template template="fields-to-refresh.html"
modal-data="vm.modalData">
</dialog-editor-modal-field-template>
</form>
</div>
<div ng-if="vm.modalTabIsSet('options') && vm.modalData.dynamic">
<form class="form-horizontal">
<div ng-show="!vm.treeOptions.show">
<div pf-form-group pf-label="{{'Entry Point'|translate}}">
<div class="input-group">
<input type="text" class="form-control" ng-value="vm.showFullyQualifiedName(vm.modalData.resource_action)" disabled>
<span class="input-group-btn">
<button class="btn btn-default" ng-click="vm.treeOptions.toggle();"><i class="ff ff-load-balancer"></i></button>
</span>
</div>
</div>
<div pf-form-group pf-label="{{'Show Refresh Button'|translate}}">
<input bs-switch
ng-model="vm.modalData.show_refresh_button"
type="checkbox"
switch-on-text="{{'Yes'|translate}}"
switch-off-text="{{'No'|translate }}"/>
</div>
<div pf-form-group pf-label="{{'Show Past Dates'|translate}}">
<input bs-switch
ng-model="vm.modalData.options.show_past_dates"
type="checkbox"
switch-on-text="{{'Yes'|translate}}"
switch-off-text="{{'No'|translate}}">
</div>
<dialog-editor-modal-field-template template="fields-to-refresh.html"
modal-data="vm.modalData">
</dialog-editor-modal-field-template>
</div>

<div pf-form-group pf-label="{{'Required'|translate}}">
<input bs-switch
ng-model="vm.modalData.required"
type="checkbox"
switch-on-text="{{'Yes'|translate}}"
switch-off-text="{{'No'|translate}}">
</div>

<dialog-editor-tree-selector ng-if="vm.treeOptions.show"
tree-options="vm.treeOptions">
</dialog-editor-tree-selector>
</form>
</div>
<div ng-if="vm.modalTabIsSet('overridable') && vm.modalData.dynamic">
<form class="form-horizontal">
<div pf-form-group pf-label="{{'Read only'|translate}}">
<input bs-switch
ng-model="vm.modalData.read_only"
type="checkbox"
switch-on-text="{{'Yes'|translate}}"
switch-off-text="{{'No'|translate}}">
</div>
<div pf-form-group pf-label="{{'Visible'|translate}}">
<input bs-switch
ng-model="vm.modalData.visible"
type="checkbox"
switch-on-text="{{'Yes'|translate}}"
switch-off-text="{{'No'|translate}}">
</div>
</form>
</div>
23 changes: 23 additions & 0 deletions src/dialog-editor/components/modal-field-template/date-time-control.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,29 @@
switch-on-text="{{'Yes'|translate}}"
switch-off-text="{{'No'|translate}}">
</div>
<div pf-form-group pf-label="{{'Default value'|translate}}">
<div class="dateTimePadding">
<p class="input-group">
<input uib-datepicker-popup="MM/dd/yyyy"
type="text"
class="form-control"
ng-model="vm.modalData.default_value"
is-open="open"
min-date="vm.minDate"
close-text="{{'Close'|translate}}"
id="{{ vm.dialogField.name }}"/>
<span class="input-group-btn">
<button type="button"
class="btn btn-default"
ng-click="open = !open">
<i class="fa fa-calendar"></i></button>
</span>
</p>
</div>
<div >
<uib-timepicker ng-model="vm.modalData.default_value"></uib-timepicker>
</div>
</div>
<div pf-form-group pf-label="{{'Read only'|translate}}">
<input bs-switch
ng-model="vm.modalData.read_only"
Expand Down
3 changes: 2 additions & 1 deletion src/dialog-editor/components/modal-field-template/modalFieldTemplateComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ class ModalFieldController {
public readonly DROPDOWN_ENTRY_DESCRIPTION: number = 1;

/*@ngInject*/
constructor(private $scope, private $element: any) {
constructor(private $scope,
private $element: any) {
// Rules for Drag&Drop sorting of values in a Dropdown element
this.sortableOptionsValues = {
axis: 'y',
Expand Down
2 changes: 1 addition & 1 deletion src/dialog-editor/components/modal-field/field.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h4 class="modal-title" id="myModalLabel" translate>Edit Field Details</h4>
modal-data="vm.modalData">
</dialog-editor-modal-field-template>
<dialog-editor-modal-field-template ng-switch-when="DialogFieldDateControl"
template="date-time-control.html"
template="date-control.html"
show-fully-qualified-name="vm.showFullyQualifiedName"
tree-options="vm.treeOptions"
modal-tab-is-set="vm.modalTabIsSet"
Expand Down