diff --git a/src/environments/suport/dev.ts b/src/environments/suport/dev.ts new file mode 100644 index 000000000..0fdafd509 --- /dev/null +++ b/src/environments/suport/dev.ts @@ -0,0 +1,48 @@ +import { versionData } from '../../../version/git-version' +import { Environment } from './../../app/models/envarioment' + +export const DevProd: Environment = { + id:'1', + apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/', + apiChatUrl: 'https://CHAT.DONEIT.CO.AO/api/v1/', + apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket', + production: true, + domain: 'gabinetedigital.local', + defaultuser: '', + defaultuserpwd: '', + chatOffline: true, + presidential: false, + version: versionData, + sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712', + logoLabel: 'doneIT', + despachoLabel: 'do Titular', + despachoLabel2: 'Despachos do Titular', + agendaPR: 'Agenda do Titular', + agendaVP: 'Agenda do (MD)', + PR: 'Titular', + VP: '', + dispatchPR: 'Despachos Titular', +}; + +export const DevDev: Environment = { + id:'1', + apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/', + apiChatUrl: 'https://CHAT.DONEIT.CO.AO/api/v1/', + apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket', + production: true, + domain: 'gabinetedigital.local', + defaultuser: 'paulo.pinto@gabinetedigital.local', + defaultuserpwd: 'tabteste@006', + chatOffline: true, + presidential: false, + version: versionData, + sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712', + logoLabel: 'doneIT', + despachoLabel: 'do Titular', + despachoLabel2: 'Despachos do Titular', + agendaPR: 'Agenda do Titular', + agendaVP: 'Agenda do (MD)', + PR: 'Titular', + VP: '', + dispatchPR: 'Despachos Titular', +}; \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index 2291d8278..a2473f066 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "c8adef0ee", - "SHA": "c8adef0eeee9665c4543117e2049a335a762286b", + "shortSHA": "f265bebe5", + "SHA": "f265bebe55b87ebc9e78ec786eaba80321305e0c", "branch": "feature/gabineteLabels", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Apr 14 08:18:10 2023 +0100'", - "lastCommitMessage": "commit", - "lastCommitNumber": "4903", - "change": "", - "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/global.scss", + "lastCommitTime": "'Fri Apr 14 17:10:16 2023 +0100'", + "lastCommitMessage": "inicio", + "lastCommitNumber": "4904", + "change": "diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html\nindex 94f00c461..3711f99b2 100644\n--- a/src/app/pages/events/events.page.html\n+++ b/src/app/pages/events/events.page.html\n@@ -22,12 +22,12 @@\n \n \n \n-
\n-
\n-
\n+
\n+
\n+
\n
\n

{{customDate}}

\n-
\n+
\n
\n \n

Tarefas que terminam hoje

\n@@ -54,7 +54,7 @@\n
\n
\n \n-
\n+
\n
\n \n
\n@@ -178,7 +178,7 @@\n
\n \n \n-
\n+
\n
\n \n
\ndiff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss\nindex 6cd61d272..3520d3685 100644\n--- a/src/app/pages/events/events.page.scss\n+++ b/src/app/pages/events/events.page.scss\n@@ -527,6 +527,11 @@ ion-toolbar{\n display: flex !important;\n }\n \n+\n+ .box-container {\n+ height: unset !important;\n+ }\n+\n }\n \n \n@@ -558,9 +563,11 @@ ion-title{\n \n .box-container {\n background-color: white;\n+ flex-direction: column;\n }\n \n .box-container {\n+ height: 100%;\n padding: 20px;\n border-radius: 20px;\n \n@@ -599,12 +606,15 @@ ion-title{\n }\n \n .main-content {\n- flex-direction: column;\n+ // flex-direction: column;\n+ width: 100%;\n }\n \n \n \n .schedule-container {\n+ flex-grow: 1;\n+ overflow: auto;\n .schedule {\n box-shadow: unset !important;\n border: unset !important;\ndiff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts\nindex 9333cfd6d..cfd8511c3 100644\n--- a/src/app/services/auth.service.ts\n+++ b/src/app/services/auth.service.ts\n@@ -74,6 +74,7 @@ export class AuthService {\n this.SetSession(response, user)\n }\n } catch (error) {\n+ console.log(error)\n this.httpErroHandle.httpStatusHandle(error)\n } finally {\n return response\ndiff --git a/src/environments/environment.ts b/src/environments/environment.ts\nindex 2588b107b..16a865ce9 100644\n--- a/src/environments/environment.ts\n+++ b/src/environments/environment.ts\n@@ -1,6 +1,7 @@\n import { Environment } from './../app/models/envarioment'\n import { oaprDev } from './suport/oapr'\n import { doneITDev } from './suport/doneIt'\n+import { DevDev } from './suport/dev'\n \n \n-export const environment: Environment = doneITDev\n\\ No newline at end of file\n+export const environment: Environment = DevDev\n\\ No newline at end of file", + "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: src/environments/suport/dev.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/environments/environment.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file