Nice date picking
This commit is contained in:
parent
def9f4c348
commit
2c287d654a
@ -49,6 +49,32 @@
|
|||||||
<option value="false" i18n>False</option>
|
<option value="false" i18n>False</option>
|
||||||
</select>
|
</select>
|
||||||
}
|
}
|
||||||
|
@case (CustomFieldQueryOperator.GreaterThanOrEqual) {
|
||||||
|
@if (getCustomFieldByID(query.field)?.data_type === CustomFieldDataType.Date) {
|
||||||
|
<input class="form-control" placeholder="yyyy-mm-dd"
|
||||||
|
[(ngModel)]="query.value"
|
||||||
|
ngbDatepicker
|
||||||
|
#d="ngbDatepicker" />
|
||||||
|
<button class="btn btn-sm btn-outline-secondary rounded-end" (click)="d.toggle()" type="button">
|
||||||
|
<i-bs name="calendar-event"></i-bs>
|
||||||
|
</button>
|
||||||
|
} @else {
|
||||||
|
<input class="w-25 form-control rounded-end" type="text" [(ngModel)]="query.value" [disabled]="disabled">
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@case (CustomFieldQueryOperator.LessThanOrEqual) {
|
||||||
|
@if (getCustomFieldByID(query.field)?.data_type === CustomFieldDataType.Date) {
|
||||||
|
<input class="form-control" placeholder="yyyy-mm-dd"
|
||||||
|
[(ngModel)]="query.value"
|
||||||
|
ngbDatepicker
|
||||||
|
#d="ngbDatepicker" />
|
||||||
|
<button class="btn btn-sm btn-outline-secondary rounded-end" (click)="d.toggle()" type="button">
|
||||||
|
<i-bs name="calendar-event"></i-bs>
|
||||||
|
</button>
|
||||||
|
} @else {
|
||||||
|
<input class="w-25 form-control rounded-end" type="text" [(ngModel)]="query.value" [disabled]="disabled">
|
||||||
|
}
|
||||||
|
}
|
||||||
@default {
|
@default {
|
||||||
<input class="w-25 form-control rounded-end" type="text" [(ngModel)]="query.value" [disabled]="disabled">
|
<input class="w-25 form-control rounded-end" type="text" [(ngModel)]="query.value" [disabled]="disabled">
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,13 @@
|
|||||||
import { Component, EventEmitter, Input, Output } from '@angular/core'
|
import {
|
||||||
|
Component,
|
||||||
|
EventEmitter,
|
||||||
|
Injectable,
|
||||||
|
Input,
|
||||||
|
Output,
|
||||||
|
} from '@angular/core'
|
||||||
|
import { NgbDateAdapter, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap'
|
||||||
import { Subject, first, takeUntil } from 'rxjs'
|
import { Subject, first, takeUntil } from 'rxjs'
|
||||||
import { CustomField } from 'src/app/data/custom-field'
|
import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
|
||||||
import {
|
import {
|
||||||
CustomFieldQueryAtom,
|
CustomFieldQueryAtom,
|
||||||
CustomFieldQueryExpression,
|
CustomFieldQueryExpression,
|
||||||
@ -13,6 +20,7 @@ import {
|
|||||||
CustomFieldQueryElement,
|
CustomFieldQueryElement,
|
||||||
} from 'src/app/data/custom-field-query'
|
} from 'src/app/data/custom-field-query'
|
||||||
import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
|
import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
|
||||||
|
import { ISODateAdapter } from 'src/app/utils/ngb-iso-date-adapter'
|
||||||
|
|
||||||
export class CustomFieldQueriesModel {
|
export class CustomFieldQueriesModel {
|
||||||
public queries: CustomFieldQueryElement[] = []
|
public queries: CustomFieldQueryElement[] = []
|
||||||
@ -122,6 +130,7 @@ export class CustomFieldQueriesModel {
|
|||||||
export class CustomFieldsQueryDropdownComponent {
|
export class CustomFieldsQueryDropdownComponent {
|
||||||
public CustomFieldQueryComponentType = CustomFieldQueryElementType
|
public CustomFieldQueryComponentType = CustomFieldQueryElementType
|
||||||
public CustomFieldQueryOperator = CustomFieldQueryOperator
|
public CustomFieldQueryOperator = CustomFieldQueryOperator
|
||||||
|
public CustomFieldDataType = CustomFieldDataType
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
title: string
|
title: string
|
||||||
@ -211,6 +220,10 @@ export class CustomFieldsQueryDropdownComponent {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public getCustomFieldByID(id: number): CustomField {
|
||||||
|
return this.customFields.find((field) => field.id === id)
|
||||||
|
}
|
||||||
|
|
||||||
public addAtom(expression: CustomFieldQueryExpression) {
|
public addAtom(expression: CustomFieldQueryExpression) {
|
||||||
expression.addAtom()
|
expression.addAtom()
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user