- Nova Acção
+ Nova Acção ...
-
-
+
-
+
();
@Output() getActions= new EventEmitter();
@@ -44,15 +40,11 @@ export class NewActionPage implements OnInit {
) {
this.folder = new PublicationFolder();
+
+ this.setStartDate()
+ this.setEndDate()
}
- get dateStart () {
- return this.dateControlStart.value
- }
-
- get dateEnd () {
- return this.dateControlEnd.value
- }
ngOnInit() {
this.segment = "Evento";
@@ -150,44 +142,56 @@ export class NewActionPage implements OnInit {
}
+ round() {
+ let date = new Date();
+ const minutes = date.getMinutes();
+ date.setSeconds(0);
+
+ if(minutes % 15 != 0) {
+
+ if (minutes > 45) {
+ date.setMinutes(60)
+ } else if (minutes > 30) {
+ date.setMinutes(45)
+ } else if (minutes > 15) {
+ date.setMinutes(30)
+ } else if (minutes > 1) {
+ date.setMinutes(15)
+ }
+
+ }
+
+ return date
+ }
+
roundTimeQuarterHour() {
- var timeToReturn = new Date();
- var minutes = timeToReturn.getMinutes();
- var hours = timeToReturn.getHours();
+ let date = new Date();
+ const minutes = date.getMinutes();
+ date.setSeconds(0);
- var m = (Math.round(minutes/15) * 15) % 60;
- var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
-
- if (m == 0) {
- if(minutes > m){
- m = m + 15;
+ if(minutes % 15 != 0) {
+
+ if (minutes > 45) {
+ date.setMinutes(60)
+ } else if (minutes > 30) {
+ date.setMinutes(45)
+ } else if (minutes > 15) {
+ date.setMinutes(30)
+ } else if (minutes > 1) {
+ date.setMinutes(15)
}
- timeToReturn.setHours(h);
- timeToReturn.setMinutes(m);
- }else{
- if(minutes > m){
- m = m + 15;
+ }
- timeToReturn.setHours(h);
- timeToReturn.setMinutes(m);
- }else {
- timeToReturn.setHours(h);
- timeToReturn.setMinutes(m);
- }
- }
+ return date
+ }
+
- // console.log("AFTER IF MINUTES: " +m);
- // console.log("AFTER HOURS: " +h);
-
- return timeToReturn;
+ setStartDate() {
+ this.folder.DateBegin = this.roundTimeQuarterHour()
}
- setStartDate(){
- this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour()));
- }
-
- setEndDate(){
- this.dateControlEnd = this.dateControlStart;
+ setEndDate() {
+ this.folder.DateEnd = this.folder.DateBegin;
}
}
diff --git a/version/git-version.ts b/version/git-version.ts
index 0a48bd91d..9a903f4d5 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "9c3cdf2ac",
- "SHA": "9c3cdf2ac51007c8c0453419c91c73e8be0e707f",
+ "shortSHA": "f2e95cc8b",
+ "SHA": "f2e95cc8b645b981d94b85ff0e05cfb2364aa140",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Eudes Inácio'",
- "lastCommitTime": "'Mon Feb 6 15:34:46 2023 +0100'",
- "lastCommitMessage": "notification added to chat grup",
- "lastCommitNumber": "4737",
+ "lastCommitTime": "'Mon Feb 6 17:11:30 2023 +0100'",
+ "lastCommitMessage": "action verification added to pedido details",
+ "lastCommitNumber": "4738",
"change": "",
- "changeStatus": "On branch no_bug_movemente\nYour branch is behind 'origin/no_bug_movemente' by 3 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 ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/shared/popover/request-options/request-options.page.html\n\tmodified: src/app/shared/popover/request-options/request-options.page.ts",
+ "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 and 3 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/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/models/publicationfolder.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.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/new-action/new-action.page.html\n\tmodified: src/app/pages/publications/new-action/new-action.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/app/shared/publication/new-action/new-action.page.html\n\tmodified: src/app/shared/publication/new-action/new-action.page.ts",
"changeAuthor": "eudes.inacio"
}
\ No newline at end of file