mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
string de draft id bug solved
This commit is contained in:
@@ -124,7 +124,7 @@ export class DespachoPrPage implements OnInit {
|
|||||||
}
|
}
|
||||||
this.fulltask = res;
|
this.fulltask = res;
|
||||||
let stringDraft = res.workflowInstanceDataFields.DraftIds;
|
let stringDraft = res.workflowInstanceDataFields.DraftIds;
|
||||||
let split_stringDraft = stringDraft?.split(",");
|
let split_stringDraft = stringDraft?.split(";");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
this.getDraft(split_stringDraft);
|
this.getDraft(split_stringDraft);
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ export class DespachoPage implements OnInit {
|
|||||||
this.TaskService.loadDiplomas();
|
this.TaskService.loadDiplomas();
|
||||||
let stringDraft = res.workflowInstanceDataFields.DraftIds;
|
let stringDraft = res.workflowInstanceDataFields.DraftIds;
|
||||||
console.log('sring to array', stringDraft)
|
console.log('sring to array', stringDraft)
|
||||||
let split_stringDraft = stringDraft?.split(",");
|
let split_stringDraft = stringDraft?.split(";");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
this.getDraft(split_stringDraft);
|
this.getDraft(split_stringDraft);
|
||||||
|
|||||||
+1
-1
@@ -113,7 +113,7 @@ export class DiplomaAssinarPage implements OnInit {
|
|||||||
|
|
||||||
this.fulltask = res;
|
this.fulltask = res;
|
||||||
let stringDraft = res.workflowInstanceDataFields.DraftIds;
|
let stringDraft = res.workflowInstanceDataFields.DraftIds;
|
||||||
let split_stringDraft = stringDraft?.split(",");
|
let split_stringDraft = stringDraft?.split(";");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
this.getDraft(split_stringDraft);
|
this.getDraft(split_stringDraft);
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
font-size: 18px !important;
|
font-size: 18px !important;
|
||||||
}
|
}
|
||||||
.main-header{
|
.main-header{
|
||||||
|
overflow: inherit;
|
||||||
font-family: Roboto;
|
font-family: Roboto;
|
||||||
border-top-left-radius: 25px;
|
border-top-left-radius: 25px;
|
||||||
border-top-right-radius: 25px;
|
border-top-right-radius: 25px;
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ export class DiplomaPage implements OnInit {
|
|||||||
console.log('Diploma anexo',this.fulltask.Documents )
|
console.log('Diploma anexo',this.fulltask.Documents )
|
||||||
// this.updateProcessOnDB(res)
|
// this.updateProcessOnDB(res)
|
||||||
let stringDraft = res.workflowInstanceDataFields.DraftIds;
|
let stringDraft = res.workflowInstanceDataFields.DraftIds;
|
||||||
let split_stringDraft = stringDraft?.split(",");
|
let split_stringDraft = stringDraft?.split(";");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
this.getDraft(split_stringDraft);
|
this.getDraft(split_stringDraft);
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ export class LoginPage implements OnInit {
|
|||||||
const loader = this.toastService.loading()
|
const loader = this.toastService.loading()
|
||||||
|
|
||||||
let attempt = await this.authService.login(this.userattempt, {saveSession: false})
|
let attempt = await this.authService.login(this.userattempt, {saveSession: false})
|
||||||
await this.authService.loginContenteProduction(this.userattempt, {saveSession: true})
|
const data = await this.authService.loginContenteProduction(this.userattempt, {saveSession: true})
|
||||||
|
|
||||||
|
|
||||||
loader.remove()
|
loader.remove()
|
||||||
@@ -127,6 +127,7 @@ export class LoginPage implements OnInit {
|
|||||||
if (attempt.UserId == SessionStore.user.UserId) {
|
if (attempt.UserId == SessionStore.user.UserId) {
|
||||||
|
|
||||||
await this.authService.SetSession(attempt, this.userattempt);
|
await this.authService.SetSession(attempt, this.userattempt);
|
||||||
|
CPSession.save(data)
|
||||||
this.changeProfileService.run();
|
this.changeProfileService.run();
|
||||||
|
|
||||||
if(attempt.ChatData) {
|
if(attempt.ChatData) {
|
||||||
@@ -158,6 +159,7 @@ export class LoginPage implements OnInit {
|
|||||||
|
|
||||||
await this.authService.SetSession(attempt, this.userattempt);
|
await this.authService.SetSession(attempt, this.userattempt);
|
||||||
this.changeProfileService.run();
|
this.changeProfileService.run();
|
||||||
|
CPSession.save(data)
|
||||||
|
|
||||||
|
|
||||||
if(attempt.ChatData) {
|
if(attempt.ChatData) {
|
||||||
|
|||||||
@@ -119,7 +119,8 @@ export class AuthService {
|
|||||||
if(saveSession) {
|
if(saveSession) {
|
||||||
/* this.SetSession(response, user) */
|
/* this.SetSession(response, user) */
|
||||||
console.log('teste', response);
|
console.log('teste', response);
|
||||||
CPSession.save(response)
|
|
||||||
|
return response
|
||||||
|
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
@@ -13,9 +13,9 @@ export class TinyMCEPage implements OnInit {
|
|||||||
|
|
||||||
title = '<p><img style="display: block; margin-left: auto; margin-right: auto;" src="assets/TempImgs/TCROUND.png" alt="" width="102" height="104" />Just Testing with an image yoOH.</p>';
|
title = '<p><img style="display: block; margin-left: auto; margin-right: auto;" src="assets/TempImgs/TCROUND.png" alt="" width="102" height="104" />Just Testing with an image yoOH.</p>';
|
||||||
Document: any
|
Document: any
|
||||||
content: string
|
content: ""
|
||||||
editorContent: string;
|
editorContent: "";
|
||||||
value: string;
|
value: "";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4,4 +4,4 @@ import { doneITProd } from './suport/doneIt'
|
|||||||
import { DevDev } from './suport/dev'
|
import { DevDev } from './suport/dev'
|
||||||
|
|
||||||
|
|
||||||
export const environment: Environment = oaprProd;
|
export const environment: Environment = DevDev;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ export const DevProd: Environment = {
|
|||||||
apiURL: 'https://gdapi-dev.dyndns.info/api/',
|
apiURL: 'https://gdapi-dev.dyndns.info/api/',
|
||||||
apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
|
apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
|
||||||
apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
|
apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
|
||||||
apiPCURL: 'http://192.168.0.21:9099/api/',
|
apiPCURL: 'https://gdcmapi-dev.dyndns.info/api/',
|
||||||
logoLabel: 'Presidente da República',
|
logoLabel: 'Presidente da República',
|
||||||
despachoLabel: 'Presidenciais',
|
despachoLabel: 'Presidenciais',
|
||||||
despachoLabel2: 'Despachos Presidênciais',
|
despachoLabel2: 'Despachos Presidênciais',
|
||||||
@@ -49,7 +49,7 @@ export const DevDev: Environment = {
|
|||||||
apiURL: 'https://gdapi-dev.dyndns.info/api/',
|
apiURL: 'https://gdapi-dev.dyndns.info/api/',
|
||||||
apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
|
apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
|
||||||
apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
|
apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
|
||||||
apiPCURL: 'http://192.168.0.21:9099/api/',
|
apiPCURL: 'https://gdcmapi-dev.dyndns.info/api/',
|
||||||
logoLabel: 'Presidente da República',
|
logoLabel: 'Presidente da República',
|
||||||
despachoLabel: 'Presidenciais',
|
despachoLabel: 'Presidenciais',
|
||||||
despachoLabel2: 'Despachos Presidênciais',
|
despachoLabel2: 'Despachos Presidênciais',
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user