mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
update create event from document
This commit is contained in:
@@ -113,6 +113,17 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
||||
) {
|
||||
this.loggeduser = SessionStore.user;
|
||||
this.document = this.navParams.get('document')
|
||||
|
||||
if(Array.isArray(this.document)) {
|
||||
this.attachments = this.document
|
||||
} else {
|
||||
this.attachments = [this.document]
|
||||
}
|
||||
|
||||
|
||||
|
||||
this.document = []
|
||||
|
||||
this.subject = this.navParams.get('subject')
|
||||
|
||||
this.postData = new Event();
|
||||
|
||||
@@ -7,6 +7,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
|
||||
import { EventDetailsDocumentsOptionsPage } from 'src/app/shared/popover/event-details-documents-options/event-details-documents-options.page';
|
||||
import { DocumentSetUpMeetingPage } from '../document-set-up-meeting/document-set-up-meeting.page';
|
||||
import { AlertController, ModalController } from '@ionic/angular';
|
||||
import { SearchList } from 'src/app/models/search-document';
|
||||
|
||||
@Component({
|
||||
selector: 'app-view-document',
|
||||
@@ -22,6 +23,7 @@ export class ViewDocumentPage implements OnInit {
|
||||
task: ExpedientTaskModalPageNavParamsTask;
|
||||
Document: any
|
||||
loader = true
|
||||
attachment: SearchList[] = [];
|
||||
|
||||
constructor(
|
||||
private modalController: ModalController,
|
||||
@@ -35,6 +37,7 @@ export class ViewDocumentPage implements OnInit {
|
||||
this.docId = this.navParams.get('docId');
|
||||
this.Document = this.navParams.get('Document')
|
||||
this.task = this.navParams.get('task')
|
||||
this.attachment = this.navParams.get('attachment')
|
||||
|
||||
|
||||
if(!this.file.title) {
|
||||
@@ -92,7 +95,8 @@ export class ViewDocumentPage implements OnInit {
|
||||
componentProps: {
|
||||
fulltask: this.task,
|
||||
task: this.task,
|
||||
content: ""
|
||||
content: "",
|
||||
Document:this.Document
|
||||
}
|
||||
});
|
||||
await modal.present();
|
||||
@@ -115,7 +119,7 @@ export class ViewDocumentPage implements OnInit {
|
||||
}
|
||||
|
||||
async openBookMeetingModal() {
|
||||
|
||||
console.log('this.Document', this.Document)
|
||||
let classs;
|
||||
if( window.innerWidth < 701) {
|
||||
classs = 'book-meeting-modal modal modal-desktop'
|
||||
|
||||
@@ -60,7 +60,7 @@ export class GroupContactsPage implements OnInit {
|
||||
ngOnInit() {
|
||||
// this.chatService.refreshtoken();
|
||||
this.loadUsers();
|
||||
this.getMembers();
|
||||
// this.getMembers();
|
||||
|
||||
|
||||
}
|
||||
@@ -205,8 +205,6 @@ export class GroupContactsPage implements OnInit {
|
||||
|
||||
})
|
||||
|
||||
this.users = users
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -66,22 +66,6 @@ export class ChatSystemService {
|
||||
) {
|
||||
|
||||
|
||||
const user = this.users
|
||||
|
||||
const alfa = {}
|
||||
|
||||
const sortedUserList = user.sort((a, b) => {
|
||||
if(a.name < b.name) {
|
||||
return -1;
|
||||
}
|
||||
if(a.name > b.name) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
})
|
||||
|
||||
console.log({sortedUserList})
|
||||
|
||||
this.RochetChatConnectorService.registerCallback({
|
||||
type: 'reConnect',
|
||||
funx: async () => {
|
||||
|
||||
@@ -7,6 +7,12 @@ import { ThemeService } from 'src/app/services/theme.service'
|
||||
import { ChatSystemService } from 'src/app/services/chat/chat-system.service'
|
||||
import { SessionStore } from 'src/app/store/session.service';
|
||||
|
||||
|
||||
|
||||
class UserToSelect {
|
||||
|
||||
}
|
||||
|
||||
@Component({
|
||||
selector: 'app-contacts',
|
||||
templateUrl: './contacts.page.html',
|
||||
@@ -29,9 +35,10 @@ export class ContactsPage implements OnInit {
|
||||
@Output() backToChat:EventEmitter<any> = new EventEmitter<any>();
|
||||
@Output() closeAllDesktopComponents:EventEmitter<any> = new EventEmitter<any>();
|
||||
|
||||
|
||||
userList = this.ChatSystemService.users
|
||||
|
||||
CoolList = []
|
||||
|
||||
constructor(
|
||||
private modalController: ModalController,
|
||||
private chatService: ChatService,
|
||||
@@ -57,6 +64,21 @@ export class ContactsPage implements OnInit {
|
||||
const username = e.name.toLowerCase()
|
||||
return username.includes(this.textSearch)
|
||||
})
|
||||
|
||||
|
||||
const alfa = {}
|
||||
|
||||
for (let user of this.userList) {
|
||||
|
||||
let firstCharacter = user.name.charAt(0);
|
||||
|
||||
if(!alfa[firstCharacter]) {
|
||||
alfa[firstCharacter] = [user]
|
||||
} else {
|
||||
alfa[firstCharacter].push(user)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
export let versionData = {
|
||||
"shortSHA": "6d8e0123b",
|
||||
"SHA": "6d8e0123b74f20a3e3f409b8f4d4ba900a9797cc",
|
||||
"shortSHA": "f6c911fc3",
|
||||
"SHA": "f6c911fc3272645484878a6515ca68f31f223003",
|
||||
"branch": "developer-prod",
|
||||
"lastCommitAuthor": "'Peter Maquiran'",
|
||||
"lastCommitTime": "'Sun Aug 20 00:26:24 2023 +0100'",
|
||||
"lastCommitMessage": "add parameters",
|
||||
"lastCommitNumber": "5173",
|
||||
"change": "diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\nindex 3aa373434..cc35f393c 100644\n--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n@@ -60,7 +60,7 @@ export class GroupContactsPage implements OnInit {\n ngOnInit() {\n // this.chatService.refreshtoken();\n this.loadUsers();\n- this.getMembers();\n+ // this.getMembers();\n \n \n }\n@@ -205,8 +205,6 @@ export class GroupContactsPage implements OnInit {\n \n })\n \n- this.users = users\n-",
|
||||
"changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/services/events.service.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/chat/group-messages/group-contacts/group-contacts.page.ts",
|
||||
"lastCommitTime": "'Sun Aug 20 21:02:08 2023 +0100'",
|
||||
"lastCommitMessage": "notification event",
|
||||
"lastCommitNumber": "5174",
|
||||
"change": "diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html\nindex a0814f3d1..3efac5be7 100644\n--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html\n+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html\n@@ -10,7 +10,6 @@\n <div class=\"title flex-1\"><ion-label>Despachos</ion-label></div>\n <div class=\"theicon btn-refresh d-flex align-center\">\n \n-\n <div class=\"d-flex\" (click)=\"reorderList('old')\" *ngIf=\"ordinance == 'recent' \">\n \n <ion-icon class=\"mr-10\" src=\"assets/images/theme/gov/crescente.svg\"></ion-icon>",
|
||||
"changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.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/gabinete-digital/despachos/despachos.page.html",
|
||||
"changeAuthor": "peter.maquiran"
|
||||
}
|
||||
Reference in New Issue
Block a user