peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

build problem solved

Browse Source
This commit is contained in:
Eudes Inácio
2023-01-23 16:51:30 +01:00
parent 90c9fc1c9e
commit 0292a95ddb
10 changed files with 25 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/google-services.json
-40
View File
@@ -1,40 +0,0 @@
{
"project_info": {
"project_number": "800733765231",
"firebase_url": "https://gabinete-digital-2020.firebaseio.com",
"project_id": "gabinete-digital-2020",
"storage_bucket": "gabinete-digital-2020.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:800733765231:android:e7ffc0b310037d9f13779a",
"android_client_info": {
"package_name": "com.gpr.gabinetedigital"
}
},
"oauth_client": [
{
"client_id": "800733765231-92oa7ib62ob0pkouphb5i5sp01vkalid.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyD0pfW45DLoW6mqvZRklJdbfSTskW22Fok"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "800733765231-92oa7ib62ob0pkouphb5i5sp01vkalid.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}
package-lock.json
Generated
+7 -7
View File
@@ -30,7 +30,7 @@
"@awesome-cordova-plugins/file": "^5.41.0",
"@awesome-cordova-plugins/file-opener": "^5.41.0",
"@awesome-cordova-plugins/multiple-document-picker": "^5.40.0",
"@capacitor/android": "^4.6.1",
"@capacitor/android": "^4.6.2",
"@capacitor/app": "^4.1.1",
"@capacitor/browser": "^4.1.0",
"@capacitor/camera": "^4.1.4",
@@ -3254,9 +3254,9 @@
"license": "MIT"
},
"node_modules/@capacitor/android": {
"version": "4.6.1",
"resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.6.1.tgz",
"integrity": "sha512-Hnh1tmUr1SP67U6D6ry5I5BEBSN/1nkBAIjQIqf5tF82WNxKbpbC6GfkHE4hMJZinRTrCf36LkrdP8srh7SxoA==",
"version": "4.6.2",
"resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.6.2.tgz",
"integrity": "sha512-PQpOJnMi0i/d4UrT8bPdfkwlKAlQLgsyo2YKj+iUYjEIu8sKQvqDirLYnpeKhj4cflIG2u9mh/eFncooA+u2gw==",
"peerDependencies": {
"@capacitor/core": "^4.6.0"
}
@@ -40525,9 +40525,9 @@
"version": "0.2.3"
},
"@capacitor/android": {
"version": "4.6.1",
"resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.6.1.tgz",
"integrity": "sha512-Hnh1tmUr1SP67U6D6ry5I5BEBSN/1nkBAIjQIqf5tF82WNxKbpbC6GfkHE4hMJZinRTrCf36LkrdP8srh7SxoA==",
"version": "4.6.2",
"resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.6.2.tgz",
"integrity": "sha512-PQpOJnMi0i/d4UrT8bPdfkwlKAlQLgsyo2YKj+iUYjEIu8sKQvqDirLYnpeKhj4cflIG2u9mh/eFncooA+u2gw==",
"requires": {}
},
"@capacitor/app": {
package.json
+1 -1
View File
@@ -40,7 +40,7 @@
"@awesome-cordova-plugins/file": "^5.41.0",
"@awesome-cordova-plugins/file-opener": "^5.41.0",
"@awesome-cordova-plugins/multiple-document-picker": "^5.40.0",
"@capacitor/android": "^4.6.1",
"@capacitor/android": "^4.6.2",
"@capacitor/app": "^4.1.1",
"@capacitor/browser": "^4.1.0",
"@capacitor/camera": "^4.1.4",
src/app/modals/profile/profile.page.html
+2 -2
View File
@@ -8,7 +8,7 @@
</div>
<div *ngIf="ThemeService.currentTheme == 'gov'" class="logo-description d-flex align-center justify-content-center">
<div class="logo-description-content">
<p class="logo-description-text tp-5">doneIT</p>
<p class="logo-description-text tp-5">Presidente da República</p>
<div class="add-line"></div>
<p class="logo-description-text tp-5">GABINETE DIGITAL</p>
</div>
@@ -16,7 +16,7 @@
<div *ngIf="ThemeService.currentTheme == 'default'" class="logo-description d-flex align-center justify-content-center">
<div class="logo-description-content">
<!-- <p class="logo-description-text color-white">Calendário Partilhado</p> -->
<p class="logo-description-text tp-5 color-white">doneIT</p>
<p class="logo-description-text tp-5 color-white">Presidente da República</p>
<div class="add-line-white"></div>
<p class="logo-description-text tp-5 color-white">GABINETE DIGITAL</p>
</div>
src/app/pages/gabinete-digital/gabinete-digital.page.html
+2 -2
View File
@@ -72,7 +72,7 @@
<div class="item-middle-detail-extra-text">
<ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial PR' || task.WorkflowName == 'Agenda Pessoal PR'">
<!-- Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Presidente da República -->
Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Titular
Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Presidente da República
</ion-label>
<ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial MDGPR' || task.WorkflowName == 'Agenda Pessoal MDGPR'">
A sua agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}}
@@ -229,7 +229,7 @@
</div>
<div class="exp-card-text">
<!-- <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">Despacho do Presidente da República</p> -->
<p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">Despacho do Titular</p>
<p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">Despacho do Presidente da República</p>
<p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks]) && !p.userPermission([p.permissionList.Gabinete.md_tasks])">Despachos criados por mim</p>
<p class="text-center exp-card-content">{{ despachoprstore.count }} <span class="title1">Documentos</span> </p>
</div>
src/app/shared/gabinete-digital/all-processes/all-processes.page.html
+1 -1
View File
@@ -62,7 +62,7 @@
<div class="item-middle-detail-extra-text">
<ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial PR' || task.WorkflowName == 'Agenda Pessoal PR'">
<!-- Agenda {{task.Agenda}} do Presidente da República -->
Agenda {{task.Agenda}} do Titular
Agenda {{task.Agenda}} do Presidente da República
</ion-label>
<ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial MDGPR' || task.WorkflowName == 'Agenda Pessoal MDGPR'">
A sua agenda {{task.Agenda}}
src/app/shared/header/header.page.html
+3 -3
View File
@@ -19,7 +19,7 @@
</div>
<div *ngIf="ThemeService.currentTheme == 'gov'" class="logo-description d-flex align-center justify-content-center">
<div class="logo-description-content">
<p class="logo-description-text tp-5" >doneIT</p>
<p class="logo-description-text tp-5" >Presidente da República</p>
<div class="add-line"></div>
<p class="logo-description-text tp-5" >GABINETE DIGITAL</p>
@@ -27,7 +27,7 @@
</div>
<div *ngIf="ThemeService.currentTheme == 'default' " class="logo-description d-flex align-center justify-content-center">
<div class="logo-description-content">
<p class="logo-description-text tp-5 color-white" >doneIT</p>
<p class="logo-description-text tp-5 color-white" >Presidente da República</p>
<div class="add-line-white"></div>
<p class="logo-description-text tp-5 color-white" >GABINETE DIGITAL</p>
</div>
@@ -56,7 +56,7 @@
<div *ngIf="ThemeService.currentTheme == 'gov' " class="logo-description-content">
<p *ngIf="environment.presidencia" class="logo-description-text">Calendário Partilhado</p>
<p *ngIf="!environment.presidencia" class="logo-description-text" >doneIT</p>
<p *ngIf="!environment.presidencia" class="logo-description-text" >Presidente da República</p>
<div class="add-line"></div>
<p *ngIf="!environment.presidencia" class="logo-description-text" >GABINETE DIGITAL</p>
</div>
src/environments/environment.prod.ts
+1 -1
View File
@@ -15,7 +15,7 @@ export const environment = {
// apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
// apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
production: true,
domain: 'equilibrium.co.ao', //equilibrium.ao.ao
domain: 'equilibrium.co.ao',
defaultuser: '',//paulo.pinto@gabinetedigital.local
defaultuserpwd: '', //tabteste@006,06,
chatOffline: true,
src/environments/environment.ts
+2 -2
View File
@@ -15,8 +15,8 @@ export const environment = {
apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', */
production: false,
domain: 'equilibrium.co.ao',
defaultuser: 'evandre.dasilva@equilibrium.co.ao',//evandre.dasilva@equilibrium.co.ao
defaultuserpwd: 'Luand@1219', //Luand@1219,
defaultuser: '',//evandre.dasilva@equilibrium.co.ao
defaultuserpwd: '', //Luand@1219,
chatOffline: true,
presidencia: false,
version: versionData,
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "96de420e0",
"SHA": "96de420e0b4cdd6325203eb92fce0f408e7e350b",
"shortSHA": "90c9fc1c9",
"SHA": "90c9fc1c9e3545f7f47fbc0e1b2ae39b82eb0c88",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Fri Jan 20 16:06:29 2023 +0100'",
"lastCommitMessage": "some changes",
"lastCommitNumber": "4672",
"lastCommitTime": "'Fri Jan 20 16:07:39 2023 +0100'",
"lastCommitMessage": "verion do peter changes",
"lastCommitNumber": "4674",
"change": "",
"changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 2 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/app-routing.module.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/publications/edit-action/edit-action.page.ts\n\tmodified: src/app/pages/publications/new-action/new-action.page.html\n\tmodified: src/app/pages/publications/new-action/new-action.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pages/search/search.page.html\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/chat/rochet-chat-connector.service.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts\n\tmodified: src/app/shared/popover/chat-options-popover/chat-options-popover.page.html\n\tmodified: src/app/shared/publication/edit-action/edit-action.page.ts\n\tmodified: src/app/shared/publication/new-action/new-action.page.html\n\tmodified: src/app/shared/publication/new-action/new-action.page.ts\n\tnew file: src/assets/images/theme/blue/search.svg\n\tnew file: src/assets/images/theme/gov/search.svg\n\tnew file: src/assets/images/theme/tribunal/search.svg\n\tmodified: src/global.scss",
"changeStatus": "On branch no_bug_movemente\nYour branch is behind 'origin/no_bug_movemente' by 6 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tdeleted: android/app/google-services.json\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts",
"changeAuthor": "eudes.inacio"
}