mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
improve
This commit is contained in:
Peter Maquiran
@@ -1,10 +0,0 @@
|
||||
{
|
||||
"shortSHA": "8a176e684",
|
||||
"SHA": "8a176e684f1f305917326b4241fe6758d76248dc",
|
||||
"branch": "develop_bitOut-fix",
|
||||
"lastCommitAuthor": "'Peter Maquiran'",
|
||||
"lastCommitTime": "'Thu Dec 22 12:45:26 2022 +0100'",
|
||||
"lastCommitMessage": "save",
|
||||
"lastCommitNumber": "4564",
|
||||
"diff": "diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts\nindex 82c822b98..f87892e88 100644\n--- a/src/app/pages/events/events.page.ts\n+++ b/src/app/pages/events/events.page.ts\n@@ -442,6 +442,4 @@ export class EventsPage implements OnInit {\n }\n }\n \n-\n-\n }\n\\ No newline at end of file"
|
||||
}
|
||||
@@ -228,7 +228,7 @@
|
||||
|
||||
<div class="calendar-title-container px-20 d-none d-md-flex">
|
||||
<div class="calendar-title-description flex-grow-1 text-grey d-flex justify-center align-center" *ngIf="eventService.hasOwnCalendar">
|
||||
<div >Agenda de {{loggeduser.FullName}}</div>
|
||||
<div >Agenda de {{SessionStore.user.FullName}}</div>
|
||||
</div>
|
||||
<div class="calendar-title-description text-black align-center" *ngIf="eventService.hasSharedCalendar">
|
||||
<div class="flex-grow-1 text-grey d-flex justify-center align-center">
|
||||
@@ -284,7 +284,7 @@
|
||||
<div class="description">
|
||||
<p class="m-0">{{event.event.Subject}}</p>
|
||||
</div>
|
||||
<div class="font-13"*ngIf="eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'">{{loggeduser.FullName}} </div>
|
||||
<div class="font-13"*ngIf="eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'">{{SessionStore.user.FullName}} </div>
|
||||
<ng-template #other_content>{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}</ng-template>
|
||||
</div>
|
||||
</div>
|
||||
@@ -326,7 +326,7 @@
|
||||
<div class="description">
|
||||
<p class="m-0">{{event.event.Subject}}</p>
|
||||
</div>
|
||||
<div class="font-13"*ngIf="eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'">{{loggeduser.FullName}} </div>
|
||||
<div class="font-13"*ngIf="eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'">{{SessionStore.user.FullName}} </div>
|
||||
<ng-template #other_content>{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}</ng-template>
|
||||
</div>
|
||||
</div>
|
||||
@@ -370,7 +370,7 @@
|
||||
<div class="description">
|
||||
<p class="m-0">{{event.event.Subject}}</p>
|
||||
</div>
|
||||
<div class="font-13"*ngIf="eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'"> {{loggeduser.FullName}} </div>
|
||||
<div class="font-13"*ngIf="eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'"> {{SessionStore.user.FullName}} </div>
|
||||
<ng-template #other_content>{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}</ng-template>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -34,7 +34,7 @@ import { DataService } from 'src/app/services/data.service';
|
||||
import { Storage } from '@ionic/storage';
|
||||
import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
|
||||
import { SessionStore } from 'src/app/store/session.service';
|
||||
import { async } from '@angular/core/testing';
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ export const environment = {
|
||||
// apiChatUrl: 'https://www.tabularium.pt/api/v1/',
|
||||
production: true,
|
||||
domain: 'gabinetedigital.local',
|
||||
defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto paulo.pinto@gabinetedigital.local
|
||||
defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto@gabinetedigital.local
|
||||
defaultuserpwd: 'M@p2022', //tabteste@006,
|
||||
chatOffline: true,
|
||||
presidencia: false,
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
<base href="/" />
|
||||
|
||||
|
||||
<!-- <script type="text/javascript" src="node_modules/ibm-mfp-web-sdk/ibmmfpfanalytics.js"></script>
|
||||
<script type="text/javascript" src="node_modules/ibm-mfp-web-sdk/ibmmfpf.js"></script> -->
|
||||
<!-- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.9.359/pdf.min.js" integrity="sha512-U5C477Z8VvmbYAoV4HDq17tf4wG6HXPC6/KM9+0/wEXQQ13gmKY2Zb0Z2vu0VNUWch4GlJ+Tl/dfoLOH4i2msw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script> -->
|
||||
|
||||
@@ -8,7 +8,7 @@ const authorName = childProcess.execSync("git log -1 --pretty=format:'%an'").toS
|
||||
const commitTime = childProcess.execSync("git log -1 --pretty=format:'%cd'").toString().trim();
|
||||
const commitMsg = childProcess.execSync("git log -1 --pretty=%B").toString().trim();
|
||||
const totalCommitCount = childProcess.execSync("git rev-list --count HEAD").toString().trim();
|
||||
const change = childProcess.execSync("git diff").toString().trim();
|
||||
// const change = childProcess.execSync(``).toString().trim();
|
||||
|
||||
const versionInfo = {
|
||||
shortSHA: shortSHA,
|
||||
@@ -18,7 +18,7 @@ const versionInfo = {
|
||||
lastCommitTime: commitTime,
|
||||
lastCommitMessage: commitMsg,
|
||||
lastCommitNumber: totalCommitCount,
|
||||
change
|
||||
// change
|
||||
}
|
||||
|
||||
const versionInfoJson = JSON.stringify(versionInfo, null, 2);
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"shortSHA": "8a176e684",
|
||||
"SHA": "8a176e684f1f305917326b4241fe6758d76248dc",
|
||||
"shortSHA": "27ad66597",
|
||||
"SHA": "27ad66597772babe0b448aa95f20394a959ea129",
|
||||
"branch": "develop_bitOut-fix",
|
||||
"lastCommitAuthor": "'Peter Maquiran'",
|
||||
"lastCommitTime": "'Thu Dec 22 12:45:26 2022 +0100'",
|
||||
"lastCommitMessage": "save",
|
||||
"lastCommitNumber": "4564",
|
||||
"change": "diff --git a/package.json b/package.json\nindex 0c8a34696..90f3fb61a 100644\n--- a/package.json\n+++ b/package.json\n@@ -12,7 +12,8 @@\n \"test\": \"jest --detectOpenHandles --runInBand\",\n \"test:prof\": \"ionic build --configuration production && npm run test\",\n \"dev:share\": \"lite-server --baseDir=share\",\n- \"install:chromium\": \"node node_modules/puppeteer/install.js\"\n+ \"install:chromium\": \"node node_modules/puppeteer/install.js\",\n+ \"build:version\":\"node ./version/git-version.js\"\n },\n \"private\": true,\n \"dependencies\": {\ndiff --git a/src/app/app.component.ts b/src/app/app.component.ts\nindex 974b98ca6..127ce8ee6 100644\n--- a/src/app/app.component.ts\n+++ b/src/app/app.component.ts\n@@ -15,6 +15,7 @@ import { MessageModel } from './models/beast-orm';\n import { InativityService } from \"src/app/services/inativity.service\";\n import { ThemeService } from 'src/app/services/theme.service';\n import { environment } from 'src/environments/environment';\n+import { Storage } from '@ionic/storage';\n \n const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {\n parse: {\n@@ -48,10 +49,13 @@ export class AppComponent {\n private storageservice: StorageService,\n private InativityService: InativityService,\n public ThemeService: ThemeService,\n+ private storage: Storage,\n ) {\n // this.createCacheFolder()\n this.initializeApp();\n console.log('version: '+ environment.version)\n+\n+ this.storage.set('version', environment.version).then(() => {})\n }\n \n // async createCacheFolder(){\ndiff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts\nindex 82c822b98..f47373b90 100644\n--- a/src/app/pages/events/events.page.ts\n+++ b/src/app/pages/events/events.page.ts\n@@ -95,6 +95,9 @@ export class EventsPage implements OnInit {\n this.listToPresentexpediente = []\n })\n \n+\n+ this.storage.set('events', {}).then(() => {})\n+\n }\n \n ngOnInit() {\n@@ -442,6 +445,4 @@ export class EventsPage implements OnInit {\n }\n }\n \n-\n-\n }\n\\ No newline at end of file\ndiff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts\nindex b14e21e0a..9df0e95ab 100644\n--- a/src/environments/environment.prod.ts\n+++ b/src/environments/environment.prod.ts\n@@ -1,3 +1,4 @@\n+import { versionData } from '../../version/git-version'\n export const environment = {\n // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',\n apiURL: 'https://gd-api.oapr.gov.ao/api/',\n@@ -11,10 +12,10 @@ export const environment = {\n // apiChatUrl: 'https://www.tabularium.pt/api/v1/',\n production: true,\n domain: 'gabinetedigital.local',\n- defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto paulo.pinto@gabinetedigital.local\n+ defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto@gabinetedigital.local\n defaultuserpwd: 'M@p2022', //tabteste@006,\n chatOffline: true,\n presidencia: false,\n- version: '1.0.1',\n+ version: versionData,\n sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712'\n };\n\\ No newline at end of file\ndiff --git a/src/environments/environment.ts b/src/environments/environment.ts\nindex f5edf8496..1e1555b02 100644\n--- a/src/environments/environment.ts\n+++ b/src/environments/environment.ts\n@@ -1,7 +1,8 @@\n+import { versionData } from '../../version/git-version'\n export const environment = {\n // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',\n- apiURL: 'https://gd-api.oapr.gov.ao/api/',\n- //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',\n+ //apiURL: 'https://gd-api.oapr.gov.ao/api/',\n+ apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',\n // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',\n // apiChatUrl: 'http://192.168.0.29:3000/api/v1/',\n // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',\n@@ -16,6 +17,6 @@ export const environment = {\n defaultuserpwd: 'M@p2022', //tabteste@006,\n chatOffline: true,\n presidencia: false,\n- version: '1.0.1',\n+ version: versionData,\n sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712'\n };\n\\ No newline at end of file"
|
||||
"lastCommitTime": "'Thu Dec 22 15:24:48 2022 +0100'",
|
||||
"lastCommitMessage": "fix build version",
|
||||
"lastCommitNumber": "4565",
|
||||
"change": "android\nangular.json\nbitbucket-pipelines.yml\ncapacitor.config.json\ncapacitor.config.ts\nconfig.xml\ndockerfile\ne2e\nfirebase-messaging-sw.js\ngit-version.json\ngoogle-services.json\nhooks\nionic.config.json\njest.config.js\njest-puppeteer.config.js\nkarma.conf.js\nnginx\nnode_modules\npackage.json\npackage-lock.json\nreadme.md\nresources\nsrc\ntest\ntsconfig.app.json\ntsconfig.json\ntsconfig.spec.json\ntslint.json\ntxt.txt\ntypings\nversion\nworkspace.code-workspace\nwww\nyarn-error.log"
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
export let versionData = {
|
||||
"shortSHA": "8a176e684",
|
||||
"SHA": "8a176e684f1f305917326b4241fe6758d76248dc",
|
||||
"shortSHA": "27ad66597",
|
||||
"SHA": "27ad66597772babe0b448aa95f20394a959ea129",
|
||||
"branch": "develop_bitOut-fix",
|
||||
"lastCommitAuthor": "'Peter Maquiran'",
|
||||
"lastCommitTime": "'Thu Dec 22 12:45:26 2022 +0100'",
|
||||
"lastCommitMessage": "save",
|
||||
"lastCommitNumber": "4564",
|
||||
"change": "diff --git a/package.json b/package.json\nindex 0c8a34696..90f3fb61a 100644\n--- a/package.json\n+++ b/package.json\n@@ -12,7 +12,8 @@\n \"test\": \"jest --detectOpenHandles --runInBand\",\n \"test:prof\": \"ionic build --configuration production && npm run test\",\n \"dev:share\": \"lite-server --baseDir=share\",\n- \"install:chromium\": \"node node_modules/puppeteer/install.js\"\n+ \"install:chromium\": \"node node_modules/puppeteer/install.js\",\n+ \"build:version\":\"node ./version/git-version.js\"\n },\n \"private\": true,\n \"dependencies\": {\ndiff --git a/src/app/app.component.ts b/src/app/app.component.ts\nindex 974b98ca6..127ce8ee6 100644\n--- a/src/app/app.component.ts\n+++ b/src/app/app.component.ts\n@@ -15,6 +15,7 @@ import { MessageModel } from './models/beast-orm';\n import { InativityService } from \"src/app/services/inativity.service\";\n import { ThemeService } from 'src/app/services/theme.service';\n import { environment } from 'src/environments/environment';\n+import { Storage } from '@ionic/storage';\n \n const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {\n parse: {\n@@ -48,10 +49,13 @@ export class AppComponent {\n private storageservice: StorageService,\n private InativityService: InativityService,\n public ThemeService: ThemeService,\n+ private storage: Storage,\n ) {\n // this.createCacheFolder()\n this.initializeApp();\n console.log('version: '+ environment.version)\n+\n+ this.storage.set('version', environment.version).then(() => {})\n }\n \n // async createCacheFolder(){\ndiff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts\nindex 82c822b98..f47373b90 100644\n--- a/src/app/pages/events/events.page.ts\n+++ b/src/app/pages/events/events.page.ts\n@@ -95,6 +95,9 @@ export class EventsPage implements OnInit {\n this.listToPresentexpediente = []\n })\n \n+\n+ this.storage.set('events', {}).then(() => {})\n+\n }\n \n ngOnInit() {\n@@ -442,6 +445,4 @@ export class EventsPage implements OnInit {\n }\n }\n \n-\n-\n }\n\\ No newline at end of file\ndiff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts\nindex b14e21e0a..9df0e95ab 100644\n--- a/src/environments/environment.prod.ts\n+++ b/src/environments/environment.prod.ts\n@@ -1,3 +1,4 @@\n+import { versionData } from '../../version/git-version'\n export const environment = {\n // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',\n apiURL: 'https://gd-api.oapr.gov.ao/api/',\n@@ -11,10 +12,10 @@ export const environment = {\n // apiChatUrl: 'https://www.tabularium.pt/api/v1/',\n production: true,\n domain: 'gabinetedigital.local',\n- defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto paulo.pinto@gabinetedigital.local\n+ defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto@gabinetedigital.local\n defaultuserpwd: 'M@p2022', //tabteste@006,\n chatOffline: true,\n presidencia: false,\n- version: '1.0.1',\n+ version: versionData,\n sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712'\n };\n\\ No newline at end of file\ndiff --git a/src/environments/environment.ts b/src/environments/environment.ts\nindex f5edf8496..1e1555b02 100644\n--- a/src/environments/environment.ts\n+++ b/src/environments/environment.ts\n@@ -1,7 +1,8 @@\n+import { versionData } from '../../version/git-version'\n export const environment = {\n // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',\n- apiURL: 'https://gd-api.oapr.gov.ao/api/',\n- //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',\n+ //apiURL: 'https://gd-api.oapr.gov.ao/api/',\n+ apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',\n // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',\n // apiChatUrl: 'http://192.168.0.29:3000/api/v1/',\n // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',\n@@ -16,6 +17,6 @@ export const environment = {\n defaultuserpwd: 'M@p2022', //tabteste@006,\n chatOffline: true,\n presidencia: false,\n- version: '1.0.1',\n+ version: versionData,\n sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712'\n };\n\\ No newline at end of file"
|
||||
"lastCommitTime": "'Thu Dec 22 15:24:48 2022 +0100'",
|
||||
"lastCommitMessage": "fix build version",
|
||||
"lastCommitNumber": "4565",
|
||||
"change": "android\nangular.json\nbitbucket-pipelines.yml\ncapacitor.config.json\ncapacitor.config.ts\nconfig.xml\ndockerfile\ne2e\nfirebase-messaging-sw.js\ngit-version.json\ngoogle-services.json\nhooks\nionic.config.json\njest.config.js\njest-puppeteer.config.js\nkarma.conf.js\nnginx\nnode_modules\npackage.json\npackage-lock.json\nreadme.md\nresources\nsrc\ntest\ntsconfig.app.json\ntsconfig.json\ntsconfig.spec.json\ntslint.json\ntxt.txt\ntypings\nversion\nworkspace.code-workspace\nwww\nyarn-error.log"
|
||||
}
|
||||
Reference in New Issue
Block a user