Commit 2edd3080 authored by Kertu Hiire's avatar Kertu Hiire Committed by GitHub

Merge pull request #12 from e-gov/hotfix/v7.2.1

Hotfix/v7.2.1
parents a32c9802 d156fdd5
......@@ -74,7 +74,7 @@
[(ngModel)]="decisionType"
name="decisionType">
<option [value]="'null'" selected>Vali otsus...</option>
<option [value]="globals.issue_resolution_type.POSITIVE">Kookõlastan</option>
<option [value]="globals.issue_resolution_type.POSITIVE">Kooskõlastan</option>
<option [value]="globals.issue_resolution_type.NEGATIVE">Ei kooskõlasta</option>
<option [value]="globals.issue_resolution_type.DISMISSED">Jätan läbivaatamata</option>
</select>
......
......@@ -27,7 +27,8 @@
<select id="x-road-status-input" class="form-control"
(keyup.enter)="getSystems()"
[(ngModel)]="filters.xRoadStatus">
<option [value]="''" selected>määramata</option>
<option [value]="''">kõik</option>
<option [value]="'null'">määramata</option>
<option [value]="globals.x_road_status.JOINED" selected>liidestatud</option>
<option [value]="globals.x_road_status.NOT_JOINED">ei ole liidestatud</option>
</select>
......@@ -63,7 +64,8 @@
<select id="development-status-input" class="form-control"
(keyup.enter)="getSystems()"
[(ngModel)]="filters.developmentStatus">
<option [value]="''" selected>määramata</option>
<option [value]="''">kõik</option>
<option [value]="'null'">määramata</option>
<option [value]="globals.development_status.IN_DEVELOPMENT" selected>aktiivses arenduses</option>
<option [value]="globals.development_status.NOT_IN_DEVELOPMENT">ei ole arenduses</option>
</select>
......@@ -107,7 +109,8 @@
<select id="approval-status" class="form-control"
(keyup.enter)="getOwnSystems()"
[(ngModel)]="filters.lastPositiveApprovalRequestType">
<option [value]="''">määramata</option>
<option [value]="''">kõik</option>
<option [value]="'null'">kooskõlastamata</option>
<option [value]="globals.issue_type.ESTABLISHMENT_REQUEST">asutamine kooskõlastatud</option>
<option [value]="globals.issue_type.TAKE_INTO_USE_REQUEST">kasutamine kooskõlastatud</option>
<option [value]="globals.issue_type.FINALIZATION_REQUEST">lõpetamine kooskõlastatud</option>
......@@ -120,7 +123,8 @@
<select id="system-status-input" class="form-control"
(keyup.enter)="getSystems()"
[(ngModel)]="filters.systemStatus">
<option [value]="''" selected>määramata</option>
<option [value]="''">kõik</option>
<option [value]="'null'">määramata</option>
<option [value]="globals.system_status.IN_USE">kasutusel</option>
<option [value]="globals.system_status.ESTABLISHING">asutamisel</option>
<option [value]="globals.system_status.FINISHED">lõpetatud</option>
......
......@@ -39,7 +39,8 @@
<select id="x-road-status-input" class="form-control"
(keyup.enter)="getOwnSystems()"
[(ngModel)]="filters.xRoadStatus">
<option [value]="''">määramata</option>
<option [value]="''">kõik</option>
<option [value]="'null'">määramata</option>
<option [value]="globals.x_road_status.JOINED">liidestatud</option>
<option [value]="globals.x_road_status.NOT_JOINED">ei ole liidestatud</option>
</select>
......@@ -75,7 +76,8 @@
<select id="development-status-input" class="form-control"
(keyup.enter)="getOwnSystems()"
[(ngModel)]="filters.developmentStatus">
<option [value]="''">määramata</option>
<option [value]="''">kõik</option>
<option [value]="'null'">määramata</option>
<option [value]="globals.development_status.IN_DEVELOPMENT">aktiivses arenduses</option>
<option [value]="globals.development_status.NOT_IN_DEVELOPMENT">ei ole arenduses</option>
</select>
......@@ -115,7 +117,8 @@
<select id="approval-status" class="form-control"
(keyup.enter)="getOwnSystems()"
[(ngModel)]="filters.lastPositiveApprovalRequestType">
<option [value]="''">määramata</option>
<option [value]="''">kõik</option>
<option [value]="'null'">kooskõlastamata</option>
<option [value]="globals.issue_type.ESTABLISHMENT_REQUEST">asutamine kooskõlastatud</option>
<option [value]="globals.issue_type.TAKE_INTO_USE_REQUEST">kasutamine kooskõlastatud</option>
<option [value]="globals.issue_type.FINALIZATION_REQUEST">lõpetamine kooskõlastatud</option>
......@@ -128,7 +131,8 @@
<select id="system-status-input" class="form-control"
(keyup.enter)="getOwnSystems()"
[(ngModel)]="filters.systemStatus">
<option [value]="''" selected>määramata</option>
<option [value]="''">kõik</option>
<option [value]="'null'">määramata</option>
<option [value]="globals.system_status.IN_USE">kasutusel</option>
<option [value]="globals.system_status.ESTABLISHING">asutamisel</option>
<option [value]="globals.system_status.FINISHED">lõpetatud</option>
......
......@@ -29,7 +29,7 @@ export class GeneralHelperService {
}
public getApprovalStatusText(system){
let statusDescription = 'määramata';
let statusDescription = 'kooskõlastamata';
if (system.lastPositiveApprovalRequestType) {
let status = system.lastPositiveApprovalRequestType;
switch (status) {
......
......@@ -123,16 +123,32 @@ export class SystemsService {
filtersArr.push(`stored_data,jarr,%${ filters.storedData }%`);
}
if (filters.systemStatus){
filtersArr.push(`meta.system_status.status,jilike,${ filters.systemStatus }`);
if (filters.systemStatus == 'null'){
filtersArr.push('meta.system_status.status,isnull,null');
} else {
filtersArr.push(`meta.system_status.status,jilike,${ filters.systemStatus }`);
}
}
if (filters.developmentStatus){
filtersArr.push(`meta.development_status,jilike,${ filters.developmentStatus }`);
if (filters.developmentStatus == 'null'){
filtersArr.push('meta.development_status,isnull,null');
} else {
filtersArr.push(`meta.development_status,jilike,${ filters.developmentStatus }`);
}
}
if (filters.lastPositiveApprovalRequestType){
filtersArr.push(`last_positive_approval_request_type,ilike,${ filters.lastPositiveApprovalRequestType }`);
if (filters.lastPositiveApprovalRequestType == 'null'){
filtersArr.push('last_positive_approval_request_type,isnull,null');
} else {
filtersArr.push(`last_positive_approval_request_type,ilike,${ filters.lastPositiveApprovalRequestType }`);
}
}
if (filters.xRoadStatus){
filtersArr.push(`meta.x_road_status.status,jilike,${ filters.xRoadStatus }`);
if (filters.xRoadStatus == 'null'){
filtersArr.push('meta.x_road_status.status,isnull,null');
} else {
filtersArr.push(`meta.x_road_status.status,jilike,${ filters.xRoadStatus }`);
}
}
if (filters.dateCreatedFrom){
filtersArr.push(`j_creation_timestamp,>,${ filters.dateCreatedFrom }`);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment