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

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-22 13:06:52 +01:00
parent 6f9eb09b1c
commit 51a526644a
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
version/git-version.ts
+7 -7
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "e8adb78b5",
"SHA": "e8adb78b56cf4a0ac7b11d736d3fe37b35b783e5",
"shortSHA": "6f9eb09b1",
"SHA": "6f9eb09b1c271a8f32359b7baa6c6e53314056f6",
"branch": "developer-prod",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Tue Aug 22 09:22:08 2023 +0100'",
"lastCommitMessage": "merge",
"lastCommitNumber": "5199",
"change": "",
"changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts",
"lastCommitTime": "'Tue Aug 22 11:25:13 2023 +0100'",
"lastCommitMessage": "agendas order",
"lastCommitNumber": "5200",
"change": "diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts\nindex 2418d316d..8c1b7c939 100644\n--- a/src/app/pages/events/events.page.ts\n+++ b/src/app/pages/events/events.page.ts\n@@ -104,6 +104,7 @@ export class EventsPage implements OnInit {\n this.listToPresent = [];\n })\n \n+ this.agendaColor = this.sessoStore.user.Profile\n \n if(this.agendaColor != \"PR\") {\n this.agendaColor = \"MDGPR\"\ndiff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts\nindex edbbc4a99..1810a105a 100644\n--- a/src/app/pages/publications/new-publication/new-publication.page.ts\n+++ b/src/app/pages/publications/new-publication/new-publication.page.ts\n@@ -208,9 +208,12 @@ export class NewPublicationPage implements OnInit {\n if (this.Form.invalid) return false\n \n \n+ console.log('this.publication', this.publication)\n+ alert('asdfsadf')\n \n if (this.publicationType == '3') {\n \n+ // has captured image\n if (this.capturedImage != '') {\n this.publication = {\n DateIndex: this.publication.DateIndex,\n@@ -240,7 +243,8 @@ export class NewPublicationPage implements OnInit {\n }\n \n }\n- else if (!this.publication.OriginalFileName) {\n+ // no file names\n+ else if (!this.PublicationFolderService.PublicationHasImage(this.publication)) {\n \n this.publication = {\n DateIndex: this.publication.DateIndex,\n@@ -276,8 +280,8 @@ export class NewPublicationPage implements OnInit {\n Title: this.pub.Title,\n Message: this.pub.Message,\n DatePublication: this.publication.DatePublication,\n- OriginalFileName: this.capturedImageTitle,\n- FileBase64: this.capturedImage,\n+ OriginalFileName: this.publication.OriginalFileName,\n+ FileBase64: this.publication.FileBase64,\n FileExtension: 'jpeg',\n }\n \n@@ -345,8 +349,8 @@ export class NewPublicationPage implements OnInit {\n }\n \n clear() {\n- this.capturedImageTitle = '';\n- this.capturedImage = '';\n+ this.capturedImageTitle = null;\n+ this.capturedImage = null;\n }\n \n setTitle() {\ndiff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts\nindex 4e1a59bee..1c4827837 100644\n--- a/src/app/shared/publication/new-publication/new-publication.page.ts\n+++ b/src/app/shared/publication/new-publication/new-publication.page.ts\n@@ -163,6 +163,9 @@ export class NewPublicationPage implements OnInit {\n \n }\n \n+ console.log('this.publication', this.publication)\n+ alert('asdfsadf')\n+ \n if(this.publicationType == '3') {\n \n if(this.capturedImage != '') {\ndiff --git a/src/app/store/publication-folder.service.ts b/src/app/store/publication-folder.service.ts\nindex a54700c33..9cbdac7f3 100644\n--- a/src/app/store/publication-folder.service.ts\n+++ b/src/app/store/publication-folder.service.ts\n@@ -196,6 +196,15 @@ export class PublicationFolderService {\n \n }\n \n+\n+ PublicationHasImage(Publication: Publication) {\n+ return Publication.FileBase64 != '' && Publication.FileBase64 != \"data:image/jpg;base64,null\"\n+ }\n+\n+ hasCapturedImage(Publication: Publication) {\n+ return Publication.FileBase64 != '' && Publication.FileBase64 != \"data:image/jpg;base64,null\"\n+ }\n+\n }",
"changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/global.scss\n\tmodified: version/git-version.ts\n\nChanges not staged for commit:\n (use \"git add <file>...\" to update what will be committed)\n (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/app/store/publication-folder.service.ts",
"changeAuthor": "peter.maquiran"
}