Compare commits
No commits in common. "518828be9db103158c3c0e1c0caf112489996789" and "1ba8d2189aac06855dd9c757b13eceb4765c6dee" have entirely different histories.
518828be9d
...
1ba8d2189a
2 changed files with 9 additions and 19 deletions
|
@ -12,7 +12,7 @@ var Buffer = require('buffer/').Buffer;
|
||||||
export class LanguageService {
|
export class LanguageService {
|
||||||
//
|
//
|
||||||
// URL for test using REST API to local MariaDB database
|
// URL for test using REST API to local MariaDB database
|
||||||
// private baseURL = 'http://192.168.1.18:8080/zgointl';
|
// private baseURL = 'http://localhost:8080/zgointl';
|
||||||
//
|
//
|
||||||
// URL for test using REST API to local MongoDB database
|
// URL for test using REST API to local MongoDB database
|
||||||
// private baseURL = 'http://localhost:5000/zgointl';
|
// private baseURL = 'http://localhost:5000/zgointl';
|
||||||
|
@ -54,8 +54,6 @@ export class LanguageService {
|
||||||
// Get component's text data from language database
|
// Get component's text data from language database
|
||||||
//
|
//
|
||||||
const params = new HttpParams().append('session', this.session!);
|
const params = new HttpParams().append('session', this.session!);
|
||||||
// console.log("Params -> ");
|
|
||||||
// console.log(params);
|
|
||||||
if (viewName === 'login') {
|
if (viewName === 'login') {
|
||||||
return this.http.get<LanguageData>(this.loginURL + '/?lang=' + this.zgoLanguage, {headers: reqHeaders, params: params});
|
return this.http.get<LanguageData>(this.loginURL + '/?lang=' + this.zgoLanguage, {headers: reqHeaders, params: params});
|
||||||
} else if (viewName === 'main') {
|
} else if (viewName === 'main') {
|
||||||
|
@ -73,7 +71,7 @@ export class LanguageService {
|
||||||
,{ headers : reqHeaders
|
,{ headers : reqHeaders
|
||||||
, params: params
|
, params: params
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,12 +3,12 @@
|
||||||
|
|
||||||
<div class="container"
|
<div class="container"
|
||||||
style="margin-top: 10px;
|
style="margin-top: 10px;
|
||||||
height: 700px;
|
height: 520px;
|
||||||
margin-left: 10px;
|
margin-left: 10px;
|
||||||
margin-right: 10px;">
|
margin-right: 10px;">
|
||||||
<mat-tab-group mat-tab-align-tabs="start">
|
<mat-tab-group mat-tab-align-tabs="start">
|
||||||
<mat-tab label="{{ vE.settingsTabMainlbl }}"
|
<mat-tab label="{{ vE.settingsTabMainlbl }}"
|
||||||
style="height: 620px;">
|
style="height: 400px;">
|
||||||
<div class="container" style="margin-bottom: 20px;">
|
<div class="container" style="margin-bottom: 20px;">
|
||||||
<mat-dialog-content [formGroup]="settingsForm">
|
<mat-dialog-content [formGroup]="settingsForm">
|
||||||
<mat-form-field class="settings-field" [style.width.%]="100">
|
<mat-form-field class="settings-field" [style.width.%]="100">
|
||||||
|
@ -47,22 +47,18 @@
|
||||||
</textarea>
|
</textarea>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
<table cellspacing="0" style="width: 100%">
|
<table cellspacing="0" style="width: 100%">
|
||||||
<!--
|
|
||||||
<colgroup>
|
<colgroup>
|
||||||
<col span="1" style="width: 20%;">
|
<col span="1" style="width: 20%;">
|
||||||
<col span="1" style="width: 40%;">
|
<col span="1" style="width: 40%;">
|
||||||
<col span="1" style="width: 40%;">
|
<col span="1" style="width: 40%;">
|
||||||
</colgroup>
|
</colgroup>
|
||||||
-->
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<mat-slide-toggle formControlName="useTips" class="settings-toggle" (change)="onChangeTips($event)">
|
<mat-slide-toggle formControlName="useTips" class="settings-toggle" (change)="onChangeTips($event)">
|
||||||
{{ vE.settingsUseTips }}
|
{{ vE.settingsUseTips }}
|
||||||
</mat-slide-toggle>
|
</mat-slide-toggle>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
<td align="center">
|
||||||
<tr>
|
|
||||||
<td >
|
|
||||||
<mat-slide-toggle formControlName="useTax" class="settings-toggle" (change)="onChangeTax($event)">
|
<mat-slide-toggle formControlName="useTax" class="settings-toggle" (change)="onChangeTax($event)">
|
||||||
{{ vE.settingsUseTax }}
|
{{ vE.settingsUseTax }}
|
||||||
</mat-slide-toggle>
|
</mat-slide-toggle>
|
||||||
|
@ -75,9 +71,7 @@
|
||||||
formControlName="taxRate">
|
formControlName="taxRate">
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
<td align="center">
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<mat-slide-toggle formControlName="useVat" class="settings-toggle" (change)="onChangeVat($event)">
|
<mat-slide-toggle formControlName="useVat" class="settings-toggle" (change)="onChangeVat($event)">
|
||||||
{{ vE.settingsUseVAT }}
|
{{ vE.settingsUseVAT }}
|
||||||
</mat-slide-toggle>
|
</mat-slide-toggle>
|
||||||
|
@ -94,11 +88,11 @@
|
||||||
</table>
|
</table>
|
||||||
</mat-dialog-content>
|
</mat-dialog-content>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="container"
|
<div class="container"
|
||||||
style="display: flex;
|
style="display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;">
|
||||||
margin-top: -20px;">
|
|
||||||
<button mat-raised-button
|
<button mat-raised-button
|
||||||
(click)="close()">
|
(click)="close()">
|
||||||
{{ vE.settingsCloseBtn }}
|
{{ vE.settingsCloseBtn }}
|
||||||
|
@ -109,11 +103,9 @@
|
||||||
{{ vE.settingsSaveBtn }}
|
{{ vE.settingsSaveBtn }}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<!--
|
|
||||||
<div style="height: 20px;
|
<div style="height: 20px;
|
||||||
margin-top: 10px;">
|
margin-top: 10px;">
|
||||||
</div>
|
</div>
|
||||||
-->
|
|
||||||
</mat-tab>
|
</mat-tab>
|
||||||
<mat-tab *ngIf="proVersion"
|
<mat-tab *ngIf="proVersion"
|
||||||
label="{{ vE.settingsTabIntegrations }}"
|
label="{{ vE.settingsTabIntegrations }}"
|
||||||
|
|
Loading…
Reference in a new issue