Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/components/UI/KnParameterSidebar/KnParameterSidebar.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ export interface iParameter {
lovDependentParameters?: iParameter[]
driverMaxValue?: string | null
driverMaxDateValue?: Date | null
driverMinValue?: string | null
driverMinDateValue?: Date | null
valueColumnNameMetadata?: string
descriptionColumnNameMetadata: string
initialValue?: string | number | Date | null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
'p-invalid': parameter.mandatory && parameter.parameterValue && !parameter.parameterValue[0]?.value
}"
:maxDate="parameter.driverMaxDateValue ?? undefined"
:minDate="parameter.driverMinDateValue ?? undefined"
:data-test="'parameter-date-input-' + parameter.id"
@change="updateDependency(parameter)"
@date-select="updateDependency(parameter)"
Expand Down
3 changes: 2 additions & 1 deletion src/i18n/en-US/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,6 @@
"generalSettings": {
"aiSettingsError": "No dataset available for AI settings. Please add a dataset in the Dataset Editor.",
"aiSettingsHint": "These settings are used by the AI algorithm to understand the data and provide better results. You can set the desired dataset to be investigated and columns specifid informations.",
"selectDataset": "Select Dataset",
"aisettings": "AI Settings",
"attribute": "Attribute",
"background": {
Expand Down Expand Up @@ -637,6 +636,7 @@
"xlsxExportFileName": "Dashboard XLSX export file name"
},
"profile": "Profile",
"selectDataset": "Select Dataset",
"themes": {
"applyTheme": "Apply Theme",
"dashboardTheme": "Dashboard Theme",
Expand Down Expand Up @@ -3292,6 +3292,7 @@
"layerProp": "Layer property",
"lov": "LOV",
"maxValue": "Max value",
"minValue": "Min value",
"modality": "Select modality",
"roles": "Roles",
"selectDefaultFormula": "Select",
Expand Down
27 changes: 14 additions & 13 deletions src/modules/documentExecution/documentDetails/DocumentDetails.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ export interface iAnalyticalDriver {
modalityValue: any
modalityValueForDefault: any
modalityValueForMax: any
modalityValueForMin: any
name: string
selectedLayer: any
selectedLayerProp: any
Expand Down Expand Up @@ -229,24 +230,24 @@ export interface iDocumentType {
}

export interface iMondrianSchema {
id: number,
currentContentId: number,
name: string,
description: string,
type: string,
modelLocked: boolean,
id: number
currentContentId: number
name: string
description: string
type: string
modelLocked: boolean
modelLocker: string | null
}

export interface iXMLATemplate {
address: string;
parameters: { name: string, value: string }[]
address: string
parameters: { name: string; value: string }[]
}

export interface iMondrianTemplate {
id: number,
mondrianSchema: string,
mondrianSchemaId: number,
mdxQuery: string,
id: number
mondrianSchema: string
mondrianSchemaId: number
mdxQuery: string
mondrianMdxQuery: string
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@ const formatDateDriver = (el: any, dateFormat: string) => {
const validDate = getValidDate('' + el.driverMaxValue, dateFormat)
el.driverMaxDateValue = validDate === '' ? null : validDate
}
if (el.driverMinValue) {
const validDate = getValidDate('' + el.driverMinValue, dateFormat)
el.driverMinDateValue = validDate === '' ? null : validDate
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export interface iAnalyticalDriver {
modalityValue: any
modalityValueForDefault: any
modalityValueForMax: any
modalityValueForMin: any
name: string
selectedLayer: any
selectedLayerProp: any
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export interface iDriver {
modalityValue?: any
modalityValueForDefault?: any
modalityValueForMax?: any
modalityValueForMin?: any
defaultFormula?: string
valueSelection?: any
selectedLayer?: any
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,16 @@ export default defineComponent({
if (mode.idLovForMax === null) {
mode.idLovForMax = -1
}
if (mode.idLovForMin === null) {
mode.idLovForMin = -1
}

const obj = JSON.parse(JSON.stringify(mode))
delete obj.numberOfErrors
delete obj.defLov
delete obj.typeLov
delete obj.maxLov
delete obj.minLov
delete obj.edited
this.modesToSave.push(obj)
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export default defineComponent({
if (event.value) {
this.selectedUseMode = event.value
} else {
this.selectedUseMode = { useID: -1, idLov: null, defaultFormula: null, idLovForMax: null, idLovForDefault: null, associatedRoles: [], associatedChecks: [] }
this.selectedUseMode = { useID: -1, idLov: null, defaultFormula: null, idLovForMax: null, idLovForMin: null, idLovForDefault: null, associatedRoles: [], associatedChecks: [] }
this.modes.push(this.selectedUseMode)
}
this.disabledRoles = []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,17 @@
</q-input>
</div>
</q-expansion-item>

<q-expansion-item v-if="isDate" default-opened dense icon="lock_clock" :label="$t('managers.driversManagement.useModes.minValue')" class="col-12 q-ma-none q-pa-none bg-grey-2 q-mt-sm">
<div class="row q-col-gutter-sm q-pa-sm">
<q-select dense class="col-4" filled v-model="selectedMin" :options="useModeDescriptor.minValues" option-label="name" option-value="label" emit-value map-options @update:model-value="setMin" :label="$t('managers.driversManagement.useModes.minValue')" autocomplete="" />
<q-input v-if="selectedMin === 'lov'" dense class="col-8" filled v-model="mode.minLov.name" :error="v$.mode.minLov.$invalid && v$.mode.minLov.$dirty" :error-message="v$.mode.minLov.$invalid && v$.mode.minLov.$dirty ? $t('common.validation.required', { fieldName: $t('managers.driversManagement.useModes.lov') }) : null" disable :label="$t('managers.driversManagement.useModes.lov') + '*'" autofocus>
<template v-slot:after>
<q-icon name="search" class="cursor-pointer" @click="showLovsDialog('min')" />
</template>
</q-input>
</div>
</q-expansion-item>
</form>
<LovsDialog :dialog-visible="dialogVisiable" :lovs="lovs" :selected-lov-prop="lov" @close="dialogVisiable = false" @apply="applyLov"></LovsDialog>
</q-card-section>
Expand Down Expand Up @@ -119,6 +130,7 @@ export default defineComponent({
selectedType: null,
selectedDefault: null as any,
selectedMax: null as any,
selectedMin: null as any,
lov: null as any,
lovType: null as any,
dialogVisiable: false,
Expand All @@ -142,6 +154,9 @@ export default defineComponent({
},
required_lov_for_max: () => {
return this.selectedMax != 'lov' || this.mode.maxLov.name != null
},
required_lov_for_min: () => {
return this.selectedMin != 'lov' || this.mode.minLov.name != null
}
}
return {
Expand Down Expand Up @@ -196,6 +211,10 @@ export default defineComponent({
this.lov = this.mode.maxLov
this.lovType = 'max'
break
case 'min':
this.lov = this.mode.minLov
this.lovType = 'min'
break
}
},
handleDropdowns() {
Expand All @@ -213,6 +232,12 @@ export default defineComponent({
} else {
this.selectedMax = 'none'
}

if (this.mode.idLovForMin != null) {
this.selectedMin = 'lov'
} else {
this.selectedMin = 'none'
}
},
setType() {
this.selectedDefault = 'none'
Expand Down Expand Up @@ -256,6 +281,13 @@ export default defineComponent({
}
this.modeChanged()
},
setMin() {
if (this.selectedMin == 'none') {
this.mode.idLovForMin = null
this.mode.minLov = { name: null }
}
this.modeChanged()
},
setDirty() {
this.$emit('touched')
},
Expand All @@ -278,6 +310,10 @@ export default defineComponent({
this.mode.maxLov = lov
this.mode.idLovForMax = lov.id
break
case 'min':
this.mode.minLov = lov
this.mode.idLovForMin = lov.id
break
}
this.modeChanged()
},
Expand All @@ -291,6 +327,9 @@ export default defineComponent({
if (this.mode.idLovForMax) {
this.mode.maxLov = this.lovs?.filter((lov: any) => lov.id == this.mode.idLovForMax)[0]
} else this.mode.maxLov = { name: null }
if (this.mode.idLovForMin) {
this.mode.minLov = this.lovs?.filter((lov: any) => lov.id == this.mode.idLovForMin)[0]
} else this.mode.minLov = { name: null }
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@
"key": "required_lov_for_max"
}
]
},
{
"fieldName": "minLov",
"validators": [
{
"key": "required_lov_for_min"
}
]
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,7 @@
"width": "70vw"
}
},
"globalFilterFields": [
"label",
"name",
"description"
],
"globalFilterFields": ["label", "name", "description"],
"maxValues": [
{
"label": "none",
Expand All @@ -61,6 +57,16 @@
"name": "Use a LOV"
}
],
"minValues": [
{
"label": "none",
"name": "None"
},
{
"label": "lov",
"name": "Use a LOV"
}
],
"table": {
"column": {
"style": {
Expand All @@ -85,4 +91,4 @@
"valueSelection": "man_in"
}
]
}
}
Loading