mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
merg
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { ModalController, NavParams } from '@ionic/angular';
|
||||
import { ModalController, NavParams, Platform } from '@ionic/angular';
|
||||
import { EventAttachment } from 'src/app/models/attachment.model';
|
||||
import { EventBody } from 'src/app/models/eventbody.model';
|
||||
import { EventPerson } from 'src/app/models/eventperson.model';
|
||||
@@ -91,7 +91,8 @@ export class NewEventPage implements OnInit {
|
||||
public eventService: EventsService,
|
||||
private attachmentsService: AttachmentsService,
|
||||
private toastService: ToastService,
|
||||
public ThemeService: ThemeService
|
||||
public ThemeService: ThemeService,
|
||||
private platform: Platform,
|
||||
) {
|
||||
this.loggeduser = SessionStore.user;
|
||||
this.postEvent = new Event();
|
||||
@@ -106,7 +107,10 @@ export class NewEventPage implements OnInit {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.taskParticipants = [];
|
||||
if (this.platform.is('desktop')) {
|
||||
this.taskParticipants = [];
|
||||
}
|
||||
|
||||
this.CalendarName = this.loggeduser.Profile;
|
||||
this.selectedRecurringType = "-1";
|
||||
|
||||
|
||||
@@ -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: 'oapr.gov.ao', //equilibrium.ao.ao
|
||||
domain: 'equilibrium.co.ao', //equilibrium.ao.ao
|
||||
defaultuser: '',//paulo.pinto@gabinetedigital.local
|
||||
defaultuserpwd: '', //tabteste@006,06,
|
||||
chatOffline: true,
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
export let versionData = {
|
||||
"shortSHA": "a203566b3",
|
||||
"SHA": "a203566b3e1a48383393458c7f804d59762d0dbf",
|
||||
"shortSHA": "753fbf1fa",
|
||||
"SHA": "753fbf1fad5de9121f50b1e1540220276e734297",
|
||||
"branch": "no_bug_movemente",
|
||||
"lastCommitAuthor": "'Peter Maquiran'",
|
||||
"lastCommitTime": "'Fri Jan 20 14:57:50 2023 +0100'",
|
||||
"lastCommitMessage": "improve",
|
||||
"lastCommitNumber": "4671",
|
||||
"change": "",
|
||||
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: android/app/src/main/AndroidManifest.xml",
|
||||
"lastCommitTime": "'Fri Jan 20 15:45:46 2023 +0100'",
|
||||
"lastCommitMessage": "improve manifest",
|
||||
"lastCommitNumber": "4672",
|
||||
"change": "diff --git a/.husky.rar b/.husky.rar\ndeleted file mode 100644\nindex d4ce065d3..000000000\nBinary files a/.husky.rar and /dev/null differ",
|
||||
"changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tnew file: .husky.rar\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/environments/environment.prod.ts\n\nChanges not staged for commit:\n (use \"git add/rm <file>...\" to update what will be committed)\n (use \"git restore <file>...\" to discard changes in working directory)\n\tdeleted: .husky.rar",
|
||||
"changeAuthor": "peter.maquiran"
|
||||
}
|
||||
Reference in New Issue
Block a user