-
-
-
-
- {{loadedEvent.Location}}
-
-
-
-
-
-
- {{customDate}}
-das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}
-(Não se repete)
-Repete
-
-
-
-
Intervenientes
-
-
+
\ No newline at end of file
diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss
index ba5e0870f..c74dbf83b 100644
--- a/src/app/pages/agenda/view-event/view-event.page.scss
+++ b/src/app/pages/agenda/view-event/view-event.page.scss
@@ -1,9 +1,9 @@
ion-content{
--background:transparent;
- --padding-top:0px;
+ /* --padding-top:0px;
--padding-start: 20px;
--padding-end: 20px;
- font-size: 18px;
+ font-size: 18px; */
}
ion-menu{
--height: 225px;
@@ -13,19 +13,13 @@ ion-menu{
--opacity: 1;
}
.main-header{
- width: 100%; /* 400px */
- height: 100%;
font-family: Roboto;
- border-top-left-radius: 25px;
- border-top-right-radius: 25px;
background-color: #fff;
overflow:hidden;
- padding: 30px 0px 0px 0px;
color:#000;
transform: translate3d(0, 1px, 0);
.title-content{
- padding: 0px 20px;
margin: 0px auto;
overflow: auto;
background: #fff;
@@ -37,10 +31,10 @@ ion-menu{
overflow: hidden;
}
.middle{
- width: 230px;
+ //width: 230px;
padding: 0!important;
float: left;
- margin: 2.5px 0 0 0;
+ //margin: 2.5px 0 0 0;
}
.header-icon-right{
width: 45px;
@@ -74,13 +68,16 @@ ion-menu{
}
.main-content{
- width: 100%; /* 400px */
- height: 100%;
font-family: Roboto;
margin: 0 auto;
background-color: #fff;
overflow:auto;
- padding: 15px 0px 0 0px;
+
+ .content{
+ padding: 30px 20px 0 20px !important;
+ margin: 0;
+ float: left;
+ }
.upper-content{
margin-left: 50px;
@@ -92,6 +89,14 @@ ion-menu{
margin: 0 auto;
padding: 0;
overflow: auto;
+
+ .label{
+ border-radius: 20px;
+ background: #ffb703;
+ float: right;
+ padding: 5px 13.5px 5px 13.5px;
+ color: #fff;
+ }
}
.location-detail{
@@ -188,4 +193,41 @@ ion-menu{
font-size: 13px;
}
}
+ }
+ .aside-right{
+ padding: 30px 20px 0 20px !important;
+
+ .arrow-right{
+ display: flex;
+ justify-content: flex-end;
+ margin-bottom: 20px;
+
+ .arrow-right-icon{
+ width: 37px;
+ float: right;
+ font-size: 35px;
+ overflow: hidden;
+ }
+ }
+ .buttons{
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+
+ .btn-ok, .btn-cancel, .btn-delete{
+ height: auto !important;
+ font-size: 16px !important;
+ font-weight: 600 !important;
+ width: 100% !important;
+ margin-bottom: 10px !important;
+ padding: 15px !important;
+ }
+ }
+ .solid {
+ display: block;
+ width: 90%;
+ border-top: 1px solid #ebebeb;
+ margin: 0 auto !important;
+ margin-bottom: 10px !important;
+ }
}
\ No newline at end of file
diff --git a/src/app/pages/chat/chat.module.ts b/src/app/pages/chat/chat.module.ts
index d3e4021b0..fb3ceaaeb 100644
--- a/src/app/pages/chat/chat.module.ts
+++ b/src/app/pages/chat/chat.module.ts
@@ -15,6 +15,7 @@ import { EmptyChatPage } from 'src/app/shared/chat/empty-chat/empty-chat.page';
import { ContactsPage } from 'src/app/shared/chat/messages/contacts/contacts.page';
import { NewGroupPage } from 'src/app/shared/chat/new-group/new-group.page';
import { GroupContactsPage } from 'src/app/shared/chat/group-messages/group-contacts/group-contacts.page';
+import { PipesModule } from 'src/app/pipes/pipes.module';
@NgModule({
imports: [
@@ -22,6 +23,7 @@ import { GroupContactsPage } from 'src/app/shared/chat/group-messages/group-cont
FormsModule,
IonicModule,
SharedModule,
+ PipesModule,
ChatPageRoutingModule,
RouterModule,
],
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss
index 8c5e7498a..90dfdab01 100644
--- a/src/app/pages/chat/chat.page.scss
+++ b/src/app/pages/chat/chat.page.scss
@@ -33,18 +33,17 @@ ion-content{
.main-content{
- width: 100%;
- height: 100%;
font-family: Roboto;
margin: 0 auto;
background-color: #fff;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
+
overflow: auto;
.aside-wrapper{
- padding: 0 !important;
margin: 0 !important;
+ padding: 30px 20px 0 20px !important;
}
.iconschatnew-group{
@@ -109,8 +108,7 @@ ion-content{
.aside-wrapper{
- width: 40%;
- padding: 30px 20px 0 20px !important;
+ width: 35%;
border-right: 1px solid #d8d8d8;
.aside-title{
font-size: 25px;
@@ -120,7 +118,7 @@ ion-content{
width: 340px;
} */
.aside-content{
- width: 60%;
+ width: 65%;
display: flex !important;
background-color: white;
}
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index d97cbe1ef..9f4690cb8 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -136,7 +136,7 @@ export class ChatPage implements OnInit {
this.closeAllDesktopComponents();
if( window.innerWidth <= 1024){
- //this.selectContact();
+ this.selectContact();
}
else{
console.log('here');
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
index f63a629a8..7b473c119 100644
--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
@@ -36,7 +36,7 @@
@@ -50,7 +50,7 @@
{{attendee.Name}}
+
+
+
+
+
+
+
-
-
-
-
-
-
+
-
-
- Detalhes
-{{loadedEvent.Body.Text}}
-
-
-
+ Documentos Anexados
+
+ {{loadedEvent.Subject}}
+
+
+
+
+
+
+ {{loadedEvent.Location}}{{loadedEvent.CalendarName}}
+
+
+
+
+ {{customDate}}
+das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}
+(Não se repete)
+Repete
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Intervenientes
{{attach.SourceName}}
-{{attach.Stakeholders}}{{ attach.CreateDate | date: 'dd-MM-yy' }}
-
+
+ {{attendee.Name}}
+Detalhes
+
+
+
+
+
+
+
+
+ Documentos Anexados
+{{attach.SourceName}}
+{{attach.Stakeholders}}{{ attach.CreateDate | date: 'dd-MM-yy' }}
+
+
{{user.name}}
-{{user.name}}
-