Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2020-07-17 14:18:46 +02:00
parent d0bfe30136 61afcc2d01
commit 2aa9ece99c
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active/wwwroot/src/_base/baseRestService.ts
+10 -10
View File
@@ -105,7 +105,7 @@ export class baseRestService {
transitionIn: "fadeIn",
transitionOut: "fadeOut",
})
}
if (!r) {
@@ -133,13 +133,13 @@ export class baseRestService {
let response = await this.http.post(uri, data, {
headers: headers,
params :params
params: params
} as AxiosRequestConfig);
return response;
}
protected async get(uri: string, sendAuthenticationToken: boolean = false, params: object = {}): Promise<AxiosResponse> {
protected async get(uri: string, sendAuthenticationToken: boolean = true, params: object = {}): Promise<AxiosResponse> {
let response = await this.http.get(this.baseUrl + uri,
{
headers: this.prepareHeaders(this.allwaysSendAuthenticationToken || sendAuthenticationToken, false),
@@ -149,46 +149,46 @@ export class baseRestService {
return response;
};
protected async Get<TResult>(uri: string, sendAuthenticationToken: boolean = false, params: object = {}): Promise<TResult> {
protected async Get<TResult>(uri: string, sendAuthenticationToken: boolean = true, params: object = {}): Promise<TResult> {
let result = await this.get(uri, sendAuthenticationToken, params);
if (result.status == 200)
return result.data as TResult;
return null;
}
protected async post(uri: string, data: any, sendAuthenticationToken: boolean = false): Promise<AxiosResponse> {
protected async post(uri: string, data: any, sendAuthenticationToken: boolean = true): Promise<AxiosResponse> {
let response = await this.http.post(this.baseUrl + uri, data,
{ headers: this.prepareHeaders(this.allwaysSendAuthenticationToken || sendAuthenticationToken, true) });
return response;
};
protected async Post<TResult>(uri: string, data: any, sendAuthenticationToken: boolean = false): Promise<TResult> {
protected async Post<TResult>(uri: string, data: any, sendAuthenticationToken: boolean = true): Promise<TResult> {
let result = await this.post(uri, data, sendAuthenticationToken);
if (result.status == 200)
return result.data as TResult;
return null;
}
protected async put(uri: string, data: any, sendAuthenticationToken: boolean = false): Promise<AxiosResponse> {
protected async put(uri: string, data: any, sendAuthenticationToken: boolean = true): Promise<AxiosResponse> {
let response = await this.http.put(this.baseUrl + uri, JSON.stringify(data),
{ headers: this.prepareHeaders(this.allwaysSendAuthenticationToken || sendAuthenticationToken, true) });
return response;
}
protected async Put<TResult>(uri: string, data: any, sendAuthenticationToken: boolean = false): Promise<TResult> {
protected async Put<TResult>(uri: string, data: any, sendAuthenticationToken: boolean = true): Promise<TResult> {
let result = await this.put(uri, data, sendAuthenticationToken);
if (result.status == 200)
return result.data as TResult;
return null;
}
protected async delete(uri: string, sendAuthenticationToken: boolean = false): Promise<AxiosResponse> {
protected async delete(uri: string, sendAuthenticationToken: boolean = true): Promise<AxiosResponse> {
let response = await this.http.delete(this.baseUrl + uri,
{ headers: this.prepareHeaders(this.allwaysSendAuthenticationToken || sendAuthenticationToken, false) });
return response;
}
protected async Delete<TResult>(uri: string, sendAuthenticationToken: boolean = false): Promise<TResult> {
protected async Delete<TResult>(uri: string, sendAuthenticationToken: boolean = true): Promise<TResult> {
let result = await this.delete(uri, sendAuthenticationToken);
if (result.status == 200)
return result.data as TResult;
Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue
+2 -4
View File
@@ -18,7 +18,7 @@
</div>
</foreignObject>
<foreignObject :width="delayDuration * ganttOptions.secondSize" height="26" x="0" y="44">
<div class="delay-footer">{{Math.max(value.actualDelay, value.estimatedDelay) | round(1)}}s</div>
<div class="delay-footer">{{value.estimatedDelay | round(1)}}s</div>
</foreignObject>
<line
class="vertical-line"
@@ -34,9 +34,7 @@
<div class="body-header">{{value.label | localize(value.label)}}</div>
</foreignObject>
<foreignObject :width="duration * ganttOptions.secondSize" height="26" x="0" y="44">
<div
class="body-footer"
>{{Math.max(value.actualDuration, value.estimatedDuration ) | round(1)}}s</div>
<div class="body-footer">{{value.estimatedDuration | round(1)}}s</div>
</foreignObject>
<line
v-if="showStatus && recipeValue"
Thermo.Active/wwwroot/src/services/recipeService.ts
+2 -2
View File
@@ -54,12 +54,12 @@ export class RecipeService extends baseRestService {
}
async Confirm(section: string) {
let result = await this.Put<any>((await this.BASE_URL()) + "confirm?section=" + section, true);
let result = await this.Put<any>((await this.BASE_URL()) + "confirm?section=" + section, null, true);
return result;
}
async Cancel() {
let result = await this.Put<any>((await this.BASE_URL()) + "cancel", true);
let result = await this.Put<any>((await this.BASE_URL()) + "cancel", null, true);
return result;
}
Thermo.Active/wwwroot/src/services/warmersService.ts
+3 -3
View File
@@ -26,17 +26,17 @@ export class WarmersService extends baseRestService {
}
async Confirm() {
let result = await this.Put<any>((await this.BASE_URL()) + "confirm", true);
let result = await this.Put<any>((await this.BASE_URL()) + "confirm", null, true);
return result;
}
async Cancel() {
let result = await this.Put<any>((await this.BASE_URL()) + "cancel", true);
let result = await this.Put<any>((await this.BASE_URL()) + "cancel", null, true);
return result;
}
async SetConfig() {
let result = await this.Put<any>((await this.BASE_URL()) + "setConfig", true);
let result = await this.Put<any>((await this.BASE_URL()) + "setConfig", null, true);
return result;
}