mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
bug on mobile sign diploma
This commit is contained in:
Generated
+43184
-594
File diff suppressed because it is too large
Load Diff
@@ -175,6 +175,7 @@
|
|||||||
"rocket.chat.realtime.api.rxjs": "^2.1.1",
|
"rocket.chat.realtime.api.rxjs": "^2.1.1",
|
||||||
"rxjs": "~6.6.3",
|
"rxjs": "~6.6.3",
|
||||||
"rxjs-compat": "^6.6.7",
|
"rxjs-compat": "^6.6.7",
|
||||||
|
"send-intent": "^5.0.0",
|
||||||
"sharp": "^0.30.7",
|
"sharp": "^0.30.7",
|
||||||
"socket.io-client": "^2.3.0",
|
"socket.io-client": "^2.3.0",
|
||||||
"tinymce": "^6.6.0",
|
"tinymce": "^6.6.0",
|
||||||
|
|||||||
+6
-3
@@ -39,6 +39,7 @@ export class DiplomaAssinarPage implements OnInit {
|
|||||||
customDate: any;
|
customDate: any;
|
||||||
caller: string;
|
caller: string;
|
||||||
mergedArray: any = [];
|
mergedArray: any = [];
|
||||||
|
draftArray: any = [];
|
||||||
DraftIds = ""
|
DraftIds = ""
|
||||||
DraftNames = ""
|
DraftNames = ""
|
||||||
asDraft = true;
|
asDraft = true;
|
||||||
@@ -492,6 +493,7 @@ export class DiplomaAssinarPage implements OnInit {
|
|||||||
"ownerId": resd.data.ownerId,
|
"ownerId": resd.data.ownerId,
|
||||||
"status": resd.data.status,
|
"status": resd.data.status,
|
||||||
};
|
};
|
||||||
|
this.draftArray.push(object);
|
||||||
this.mergedArray.push(object);
|
this.mergedArray.push(object);
|
||||||
this.DraftNames += resd.data.description + ";";
|
this.DraftNames += resd.data.description + ";";
|
||||||
this.DraftIds += resd.data.id + ";";
|
this.DraftIds += resd.data.id + ";";
|
||||||
@@ -502,13 +504,14 @@ export class DiplomaAssinarPage implements OnInit {
|
|||||||
});
|
});
|
||||||
|
|
||||||
await Promise.all(draftPromises);
|
await Promise.all(draftPromises);
|
||||||
|
if (this.draftArray.length == 0) {
|
||||||
|
console.log('No draft found.');
|
||||||
|
this.asDraft = false
|
||||||
|
}
|
||||||
|
|
||||||
if (this.DraftNames) {
|
if (this.DraftNames) {
|
||||||
this.DraftNames = this.DraftNames.slice(0, -1);
|
this.DraftNames = this.DraftNames.slice(0, -1);
|
||||||
this.DraftIds = this.DraftIds.slice(0, -1);
|
this.DraftIds = this.DraftIds.slice(0, -1);
|
||||||
} else {
|
|
||||||
console.log('No draft found.');
|
|
||||||
this.asDraft = false
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ export class HttpErrorHandle {
|
|||||||
validationMessagge(service: string, callback?: any) {
|
validationMessagge(service: string, callback?: any) {
|
||||||
switch (service) {
|
switch (service) {
|
||||||
case 'diplomaAsDraft':
|
case 'diplomaAsDraft':
|
||||||
this.toastService._badRequest('Este diploma não contem um draft para ser assinado!')
|
this.toastService._badRequest('Este diploma não contem um rascunho para ser assinado!')
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ export class DiplomaOptionsPage implements OnInit {
|
|||||||
fulltask: any
|
fulltask: any
|
||||||
DraftIds = ""
|
DraftIds = ""
|
||||||
DraftNames = ""
|
DraftNames = ""
|
||||||
asDrat: boolean;
|
asDraft: boolean;
|
||||||
|
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
@@ -48,7 +48,7 @@ export class DiplomaOptionsPage implements OnInit {
|
|||||||
|
|
||||||
this.DraftIds = this.navParams.get("DraftIds");
|
this.DraftIds = this.navParams.get("DraftIds");
|
||||||
this.DraftNames = this.navParams.get("DraftNames");
|
this.DraftNames = this.navParams.get("DraftNames");
|
||||||
this.asDrat = this.navParams.get('asDrat');
|
this.asDraft = this.navParams.get('asDraft');
|
||||||
|
|
||||||
|
|
||||||
console.log('this.task', this.task)
|
console.log('this.task', this.task)
|
||||||
@@ -241,7 +241,7 @@ export class DiplomaOptionsPage implements OnInit {
|
|||||||
|
|
||||||
async AssinarNew(note?, doc?) {
|
async AssinarNew(note?, doc?) {
|
||||||
|
|
||||||
if (this.asDrat) {
|
if (this.asDraft) {
|
||||||
const modal = await this.modalController.create({
|
const modal = await this.modalController.create({
|
||||||
component: PopupQuestionPage,
|
component: PopupQuestionPage,
|
||||||
componentProps: {
|
componentProps: {
|
||||||
|
|||||||
Reference in New Issue
Block a user