@@ -19,7 +19,7 @@
-
+
{{member.name}},
@@ -39,6 +40,7 @@
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/src/app/models/envarioment.ts b/src/app/models/envarioment.ts
index 760187d8b..ca3be5384 100644
--- a/src/app/models/envarioment.ts
+++ b/src/app/models/envarioment.ts
@@ -20,7 +20,8 @@ export interface Environment {
PR: string
VP: string
dispatchPR: string
- storageProduction: boolean
+ storageProduction: boolean
+ rejectUnauthorized: string
}
diff --git a/src/app/models/eventperson.model.ts b/src/app/models/eventperson.model.ts
index 66afcf99f..959e16d3f 100644
--- a/src/app/models/eventperson.model.ts
+++ b/src/app/models/eventperson.model.ts
@@ -3,4 +3,5 @@ export class EventPerson{
Name: string;
IsRequired: boolean;
UserType: string;
+ IsPR: boolean
}
\ No newline at end of file
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 3418faa07..02ecb1522 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -1,4 +1,4 @@
-@import '~src/function.scss';
+@import "~src/function.scss";
.event-indicator {
background: #333;
@@ -8,70 +8,67 @@
display: table-cell;
}
-
:host ::ng-deep {
.monthview-primary-with-event {
/* background-color: white !important; */
}
- .monthview-current{
+ .monthview-current {
/* background-color: red; */
border-bottom: 1px solid rgb(158, 250, 135) !important;
}
.monthview-selected {
/* background-color: lightskyblue !important; */
}
- .item{
+ .item {
/* background: red !important; */
text-transform: capitalize;
}
- .input-wrapper{
+ .input-wrapper {
border-left: red !important;
/* background: red; */
margin-left: 1px solid red;
}
}
-
-.main-header{
+.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;
+ overflow: hidden;
padding: 15px 5px 0px 5px;
- color:#000;
+ color: #000;
transform: translate3d(0, 1px, 0);
- .title-content{
+ .title-content {
width: 360px;
margin: 0px auto;
padding: 0 !important;
background: #ecf8ff;
}
.div-title {
- padding: 0!important;
+ padding: 0 !important;
float: left;
}
.title {
font-size: rem(25);
}
- .div-icon{
+ .div-icon {
width: rem(40);
float: right;
font-size: rem(35);
overflow: auto;
padding: 1px;
}
- .div-icon ion-icon{
+ .div-icon ion-icon {
float: right;
padding-left: 20px;
}
}
-
/* TOGGLE button */
.switch {
position: relative;
@@ -80,10 +77,12 @@
height: 34px;
float: right;
right: -4px !important;
- margin:20px 20px 0 0;
+ margin: 20px 20px 0 0;
}
-.switch input {display:none;}
+.switch input {
+ display: none;
+}
.slider {
position: absolute;
@@ -95,8 +94,8 @@
background-color: #ffffff;
border: 1px solid #e16817;
color: #e16817;
- -webkit-transition: .4s;
- transition: .4s;
+ -webkit-transition: 0.4s;
+ transition: 0.4s;
}
.slider:before {
@@ -107,8 +106,8 @@
left: 4px;
bottom: 4px;
background-color: #ffffff;
- -webkit-transition: .4s;
- transition: .4s;
+ -webkit-transition: 0.4s;
+ transition: 0.4s;
}
input:checked + .slider {
@@ -116,7 +115,7 @@ input:checked + .slider {
}
input:focus + .slider {
- box-shadow: 0 0 1px #2196F3;
+ box-shadow: 0 0 1px #2196f3;
}
input:checked + .slider:before {
@@ -126,37 +125,34 @@ input:checked + .slider:before {
}
/*------ ADDED CSS ---------*/
-.pr
-{
+.pr {
display: none;
text-align: left !important;
left: 25px !important;
color: white;
}
-.mdgpr
-{
-
+.mdgpr {
left: 58px !important;
color: #e16817;
}
-.pr, .mdgpr
-{
+.pr,
+.mdgpr {
position: absolute;
- transform: translate(-50%,-50%);
+ transform: translate(-50%, -50%);
top: 50%;
left: 50%;
font-size: rem(12);
font-family: Verdana, sans-serif;
}
-input:checked+ .slider .pr
-{display: block;
- background:#e16817;
+input:checked + .slider .pr {
+ display: block;
+ background: #e16817;
}
-input:checked + .slider .mdgpr
-{display: none;
+input:checked + .slider .mdgpr {
+ display: none;
}
/*--------- END --------*/
@@ -164,7 +160,6 @@ input:checked + .slider .mdgpr
/* Rounded sliders */
.slider.round {
border-radius: 34px;
-
}
.slider.round:before {
@@ -178,10 +173,10 @@ Calendar
*/
/* NEW CSS FOR TOGGLE BUTTON */
-.toggleBox{
- margin:20px 12px 7px 0;
+.toggleBox {
+ margin: 20px 12px 7px 0;
}
-input[type="checkbox"]{
+input[type="checkbox"] {
position: relative;
width: 96px;
height: 34px;
@@ -189,15 +184,15 @@ input[type="checkbox"]{
-webkit-appearance: none;
border-radius: 20px;
outline: none;
- transition: .4s;
+ transition: 0.4s;
/* box-shadow: inset 0 0 5px rgba(0,0,0,0.2); */
cursor: pointer;
- border:1px solid #e16817;
+ border: 1px solid #e16817;
}
-input:checked[type="checkbox"]{
+input:checked[type="checkbox"] {
background: #e16817;
}
-input[type="checkbox"]::before{
+input[type="checkbox"]::before {
z-index: 2;
position: absolute;
content: "";
@@ -207,97 +202,96 @@ input[type="checkbox"]::before{
background: #fff;
border-radius: 50%;
/* transform: scale(1.1); */
- box-shadow: inset 0 2px 5px rgba(0,0,0,0.2);
- border:1px solid #e16817;
+ box-shadow: inset 0 2px 5px rgba(0, 0, 0, 0.2);
+ border: 1px solid #e16817;
}
-input:checked[type="checkbox"]::before{
+input:checked[type="checkbox"]::before {
left: 65px;
-
}
-.toggle{
+.toggle {
position: relative;
display: block;
- font-family: 'Montserrat', sans-serif;
+ font-family: "Montserrat", sans-serif;
/* display: grid; */
text-align: center;
}
-label{
+label {
position: absolute;
color: #fff;
font-weight: 600;
font-size: rem(12);
pointer-events: none;
}
-.onbtn{
- top:10px;
+.onbtn {
+ top: 10px;
bottom: 15px;
left: 15px;
/* padding-top: 10px;
border: 1px solid red; */
}
-.ofbtn{
- top:10px;
+.ofbtn {
+ top: 10px;
bottom: 15px;
right: 14px;
- color: #e16817;
+ color: #e16817;
}
td.monthview-primary-with-event {
background-color: white !important;
}
-.header-title{
+.header-title {
font-family: Roboto;
font-size: rem(25);
margin: 0 5px 0 25px;
padding: 0;
/* color:#ffffff; */
- color:#000;
+ color: #000;
}
-.div-top-header{
+.div-top-header {
width: 400px;
margin: 0 auto;
background-color: #07c941;
padding-top: 15px;
- border: 0!important;
+ border: 0 !important;
- .div-search{
+ .div-search {
font-size: rem(45);
float: left;
- margin: 0 0 0 10px
+ margin: 0 0 0 10px;
}
- .div-logo{
+ .div-logo {
background: transparent;
width: 140px;
margin: 5px 0 0px 71px;
float: left;
}
- .div-logo img{
+ .div-logo img {
width: 100%;
}
- .div-profile{
+ .div-profile {
font-size: rem(45);
float: right;
margin-right: 10px;
}
}
-.main-content{
+.main-content {
width: 100%; /* 400px */
height: 100%;
font-family: Roboto;
margin: 0 auto;
background-color: #fff;
- overflow:auto;
+ overflow: auto;
/* padding: 25px 20px 0 20px; */
color: #000 !important;
}
.segment {
-
}
- div ion-raw > ul > li{
+div ion-raw > ul > li {
font-size: rem(15);
- font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+ font-family: "Trebuchet MS", "Lucida Sans Unicode", "Lucida Grande",
+ "Lucida Sans", Arial, sans-serif;
}
/* Timeline */
@@ -310,23 +304,17 @@ td.monthview-primary-with-event {
background-color: #42b9fe !important;
}
-.calendar-tool-tip{
- ion-icon{
+.calendar-tool-tip {
+ ion-icon {
font-size: rem(30);
}
- .arrow-down{
+ .arrow-down {
font-size: rem(28);
}
-
}
-
-
-
-
-.drop-down{
-
- .drop-down-container{
+.drop-down {
+ .drop-down-container {
display: none;
border-top: 2px solid #42b9fe;
position: absolute;
@@ -337,10 +325,10 @@ td.monthview-primary-with-event {
border-bottom-left-radius: 5px;
margin-left: -122px;
padding: 4px 15px;
- ul{
+ ul {
margin: 0px;
padding: 0px;
- li{
+ li {
list-style: none;
height: rem(35);
display: flex;
@@ -350,8 +338,7 @@ td.monthview-primary-with-event {
}
}
-
-.capitaliseText{
+.capitaliseText {
min-width: 135px;
text-align: center;
font-weight: normal;
@@ -361,27 +348,24 @@ td.monthview-primary-with-event {
text-transform: capitalize;
}
-.arrow{
+.arrow {
padding: 0px 0px;
}
-.right-icons, .calendar-profile{
- padding: 0px 9px
+.right-icons,
+.calendar-profile {
+ padding: 0px 9px;
}
-
-.capitaliseText{
+.capitaliseText {
font-size: rem(20);
}
-
-.calendar-tool-tip{
+.calendar-tool-tip {
padding: 37px 10px 20px 10px;
//border: 1px solid orange;
-
}
-
.custom-calendar-header {
width: 100%;
margin-bottom: 10px;
@@ -397,23 +381,21 @@ td.monthview-primary-with-event {
}
}
-
-
-.currente-date-timelien{
+.currente-date-timelien {
cursor: pointer;
padding: 10px 20px;
- .collaps{
+ .collaps {
font-size: rem(20);
padding-right: 8px;
}
- .filter{
+ .filter {
font-size: rem(15);
font-weight: normal;
- ion-icon{
+ ion-icon {
font-size: rem(35);
color: var(--title-text-color);
}
- .filter-name{
+ .filter-name {
color: var(--title-text-color);
font-family: Roboto;
font-size: rem(15);
@@ -421,7 +403,7 @@ td.monthview-primary-with-event {
width: 55px;
}
- ul{
+ ul {
background-color: white !important;
position: absolute;
padding: 0px;
@@ -433,80 +415,78 @@ td.monthview-primary-with-event {
border-radius: 5px;
width: 96px;
z-index: 1000000;
- li{
+ li {
padding: 5px 10px;
font-size: rem(15);
font-weight: normal;
}
- li.active{
+ li.active {
background-color: var(--mat-selected) !important;
color: white;
}
- li:hover:not(.active){
+ li:hover:not(.active) {
background-color: var(--mat-selected-hover);
-
}
}
}
}
-.timeline-date{
+.timeline-date {
font-size: rem(13);
font-weight: 500;
color: gray;
}
-.showcalendar{
+.showcalendar {
display: none;
}
-.timeline-header{
+.timeline-header {
z-index: 1000000;
width: 100%;
background-color: white;
}
-
-.timeline-container{
-
+.timeline-container {
.day {
font-weight: 500;
color: gray !important;
font-size: rem(13);
}
- .EventListBoxBorder{
+ .EventListBoxBorder {
padding-bottom: 5px;
border-bottom: 1px solid #d8d8d8;
}
- .content-pr-Oficial, .content-pr-Pessoal, .content-mdgpr-Pessoal, .content-mdgpr-Oficial {
+ .content-pr-Oficial,
+ .content-pr-Pessoal,
+ .content-mdgpr-Pessoal,
+ .content-mdgpr-Oficial {
width: 100% !important;
padding: 0px 10px !important;
}
-
-
- .schedule-time{
+ .schedule-time {
margin-right: 10px;
min-width: 33px;
- .time-start{
+ .time-start {
color: #797979 !important;
font-family: Roboto;
font-size: rem(13);
}
- .time-end{
+ .time-end {
color: #797979 !important;
font-family: Roboto;
font-size: rem(13);
}
}
- .schedule-date{
+ .schedule-date {
margin-right: 10px;
width: 22%;
color: #797979 !important;
font-size: rem(13);
}
- .schedule-details{
+ .schedule-details {
display: flex;
flex-wrap: wrap;
align-items: center;
@@ -518,18 +498,20 @@ td.monthview-primary-with-event {
font-family: Roboto;
color: black;
font-size: rem(14);
-
}
.calendar-owner {
font-size: rem(14);
}
-
- .description{
- width: 100%;
+
+ .description {
font-family: Roboto;
font-weight: bold;
color: var(--title-text-color);
+ max-width: 250px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.description p {
@@ -537,10 +519,13 @@ td.monthview-primary-with-event {
overflow: hidden !important;
text-overflow: ellipsis !important;
font-size: rem(17);
+ max-width: 250px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
-
}
- .color{
+ .color {
width: 5px;
height: rem(40);
border-top-right-radius: 5px;
@@ -548,32 +533,32 @@ td.monthview-primary-with-event {
background-color: #f05d5e;
}
- .div-content-Oficial{
+ .div-content-Oficial {
width: 85%;
float: left;
border-left: 4px solid #cab0dc;
padding: 0 0 0 12px;
}
- .div-content-Pessoal{
+ .div-content-Pessoal {
width: 85%;
float: left;
border-left: 4px solid #cbeecb;
padding: 0 0 0 12px;
}
- .div-content-Oficial h3, .div-content-Pessoal h3{
+ .div-content-Oficial h3,
+ .div-content-Pessoal h3 {
font-size: rem(19);
/* border: 1px solid red; */
}
- .div-content-Oficial p, .div-content-Pessoal p{
+ .div-content-Oficial p,
+ .div-content-Pessoal p {
font-size: rem(16);
color: rgb(94, 92, 92);
padding: 0 !important;
margin: 0 !important;
}
-
}
-
.myCalendar {
.content--Oficial {
border-radius: 5px;
@@ -588,13 +573,13 @@ td.monthview-primary-with-event {
}
.sharedCalendar {
- .content-Oficial{
+ .content-Oficial {
width: 85%;
float: left;
border-left: 4px solid #cab0dc;
padding: 0 0 0 12px;
}
- .content-Pessoal{
+ .content-Pessoal {
width: 85%;
float: left;
border-left: 4px solid #cbeecb;
@@ -602,38 +587,36 @@ td.monthview-primary-with-event {
}
}
-.calendar-border{
+.calendar-border {
background: #ebebeb;
margin: 13px 20px;
height: 2px;
}
-
-.calendar-progress-bar{
+.calendar-progress-bar {
position: absolute;
width: 100%;
margin-left: 10px;
}
-
-.agenda-container{
+.agenda-container {
overflow: hidden;
}
-.container-wrapper{
+.container-wrapper {
height: 100%;
overflow: hidden;
- .calendar-timeline{
+ .calendar-timeline {
border-top-right-radius: 0px;
width: calc(100%);
overflow: hidden;
- .calendar-wrapper{
+ .calendar-wrapper {
width: 100%;
}
- .timeline-wrapper{
+ .timeline-wrapper {
width: 100%;
overflow: auto;
// overflow-x: hidden;
@@ -641,18 +624,15 @@ td.monthview-primary-with-event {
}
}
-
-
-.event-details{
+.event-details {
display: none;
}
-
@media only screen and (min-width: 1024px) {
- .container-wrapper{
+ .container-wrapper {
height: 100%;
- .calendar-timeline{
+ .calendar-timeline {
border-top-right-radius: 0px;
border-top-left-radius: 25px;
width: calc(100% - 40%);
@@ -664,16 +644,12 @@ td.monthview-primary-with-event {
flex-wrap: unset;
}
}
- .event-details{
+ .event-details {
display: block;
}
}
-
-
-
-
-app-view-event{
+app-view-event {
height: 100%;
display: flex;
flex-wrap: wrap-reverse;
@@ -681,14 +657,14 @@ app-view-event{
z-index: 1000;
}
-app-edit-event{
+app-edit-event {
display: flex;
flex-direction: column;
height: 100%;
z-index: 1000;
}
-app-new-event{
+app-new-event {
height: 100%;
display: flex;
flex-wrap: wrap;
@@ -696,14 +672,14 @@ app-new-event{
z-index: 1000;
}
-app-event-list{
+app-event-list {
flex-direction: column;
height: 100%;
flex-wrap: wrap-reverse;
z-index: 1000;
}
-app-approve-event{
+app-approve-event {
display: flex;
flex-direction: column;
height: 100%;
@@ -711,25 +687,23 @@ app-approve-event{
z-index: 1000;
}
-.transparent{
+.transparent {
position: absolute;
z-index: 0;
opacity: 0;
}
-.nothing-to-show{
+.nothing-to-show {
justify-content: center;
display: flex;
align-items: center;
height: 100%;
}
-
.fs-timeline {
border-right: 1px solid #909090;
}
-
// .filter-Pessoal {
// .content-pr-Oficial, .content-mdgpr-Oficial, .content-md-Pessoal {
// display: none !important;
@@ -743,7 +717,6 @@ app-approve-event{
// }
-
.dropdown-scroll-weel {
display: flex;
position: absolute;
@@ -759,12 +732,13 @@ app-approve-event{
border-top: 2px solid #42b9fe;
border-top-left-radius: 0px;
border-top-right-radius: 0px;
- li, ul {
+ li,
+ ul {
list-style: none;
padding: 5px 0px;
margin: 0px;
text-align: center;
- span{
+ span {
padding: 0px 5px;
}
}
@@ -774,14 +748,13 @@ app-approve-event{
color: white;
}
- li:hover{
+ li:hover {
cursor: pointer;
- background-color: var(--mat-selected-hover) ;
+ background-color: var(--mat-selected-hover);
}
}
-
-.dropdown-scroll-weel-background{
+.dropdown-scroll-weel-background {
position: absolute;
top: 0px;
left: 0px;
@@ -791,43 +764,38 @@ app-approve-event{
}
@media only screen and (min-width: 1225px) {
- .calendar-timeline{
-
+ .calendar-timeline {
height: 100%;
background-color: white;
border-top-left-radius: 25px;
}
- .event-details{
+ .event-details {
width: 40%;
background: white;
border-top-right-radius: 0px;
}
-
}
@media only screen and (min-width: 321px) {
-
- .calendar-timeline{
-
+ .calendar-timeline {
height: 100%;
background-color: white;
border-top-left-radius: 0px;
}
- .event-details{
+ .event-details {
width: 40%;
background: white;
border-top-right-radius: 25px;
}
-
}
@media only screen and (max-width: 415px) {
.capitaliseText {
font-size: 18px;
}
- .resize{
+ .resize {
font-size: 33px !important;
- ion-icon{
+ ion-icon {
font-size: 33px !important;
}
}
@@ -837,40 +805,36 @@ app-approve-event{
.capitaliseText {
font-size: 15px;
}
- .resize{
+ .resize {
font-size: 27px !important;
- ion-icon{
+ ion-icon {
font-size: 27px !important;
}
}
}
-
@media only screen and (max-width: 364px) {
.capitaliseText {
font-size: 13px;
}
- .resize{
+ .resize {
font-size: 23px !important;
- ion-icon{
+ ion-icon {
font-size: 23px !important;
}
}
}
-
-
-
-$font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+$font-family: "Trebuchet MS", "Lucida Sans Unicode", "Lucida Grande",
+ "Lucida Sans", Arial, sans-serif;
$font-size: rem(15);
-.changeText{
+.changeText {
font-family: $font-family;
font-size: $font-size;
-
}
-.calendar-title-container{
+.calendar-title-container {
width: 100% !important;
.calendar-title-description {
width: 50% !important;
@@ -888,10 +852,9 @@ $font-size: rem(15);
margin-top: -3px;
border: 1.5px solid black;
color: white;
- display: none;
+ display: none;
}
-
@media only screen and (max-width: 800px) {
.calendar-letters {
display: flex !important;
@@ -904,14 +867,11 @@ $font-size: rem(15);
border-color: #f05d5e !important;
}
-
-
.labelb {
font-weight: 500;
}
-
-.active{
+.active {
font-weight: bold !important;
}
@@ -919,12 +879,10 @@ $font-size: rem(15);
display: none;
}
-
.ss-timeline > :nth-child(1) .dayShow {
margin-top: 0px !important;
}
-
.calendar-options {
position: relative;
float: right;
@@ -936,16 +894,13 @@ $font-size: rem(15);
color: transparent;
background-color: transparent;
}
-
}
.float-button {
display: none;
}
-
.select-calendar {
-
mat-form-field {
width: 269px;
}
@@ -968,8 +923,8 @@ $font-size: rem(15);
button {
background: transparent;
- color: transparent;
-
+ color: transparent;
+
ion-icon {
border-radius: 50px;
-webkit-border-radius: 50px;
@@ -991,11 +946,8 @@ $font-size: rem(15);
width: 100%;
}
}
-
}
-
-
.no-color {
color: unset !important;
background: unset !important;
@@ -1004,37 +956,32 @@ $font-size: rem(15);
}
}
-
-
-
@media only screen and (min-width: 100px) {
-
- .week-5 {
+ .week-5 {
.calendar-title-container {
font-size: 14px;
}
.height-75 {
height: 75px;
}
-
+
.height-356 {
height: 324px;
}
}
- .week-6 {
+ .week-6 {
.calendar-title-container {
font-size: 14px;
}
.height-75 {
height: 75px;
}
-
+
.height-356 {
height: 360px;
}
}
-
}
@media only screen and (min-width: 500px) {
@@ -1045,7 +992,7 @@ $font-size: rem(15);
.height-75 {
height: 75px;
}
-
+
.height-356 {
height: 356px;
}
@@ -1058,12 +1005,11 @@ $font-size: rem(15);
.height-75 {
height: 75px;
}
-
+
.height-356 {
height: 395px;
}
}
-
}
.calendar-conteiner-height {
@@ -1075,4 +1021,4 @@ $font-size: rem(15);
-ms-transition: 0.5s;
-o-transition: 0.5s;
-webkit-animation: 0.5s;
-}
\ No newline at end of file
+}
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index 3e4bba864..5f4fb93d9 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -361,15 +361,16 @@
-
+
+
{{msg.u.name ?? ""}}
{{msg.time}}
-
-
+
+
- Enviado
+
+ Enviado
- Lido
+ Lido
{{last ? scrollToBottom() : ''}}
@@ -77,78 +86,115 @@
Tentar
-
-
- {{msg.u.name ?? ""}}
- {{msg.time}}
-
-
-
-
-
-
- NOT UPLOADED
-
-
-
-
- {{"Imagem"}}
-
-
+
-
+
-
+ {{msg.u.name ?? ""}}
+ {{msg.time}}
+
+
+
- {{last ? scrollToBottom() : ''}}
+
+ {{last ? scrollToBottom() : ''}}
+ 
-
- Enviado
-
-
-
-
- Lido
-
-
-
+ NOT UPLOADED
- Tentar
-
+
-
+
+
+
+ Enviado
+
+
+
+
+ Lido
+
+
+
+
+ {{"Imagem"}}
+
+
+
+ Tentar
+
+
{{"Mensagem de voz"}}
-
+
-
+
+
- {{msg.u.name ?? ""}} criou esta reunião
-
-
-
-
+ -
-
-
-
+ {{msg.u.name ?? ""}} criou esta reunião
+
+
+
+
+
+
+
+
@@ -209,9 +259,9 @@
{{last ? scrollToBottom() : ''}}
+
-
+
Adicionou {{user.name}}
@@ -231,24 +281,24 @@
-
+
\ No newline at end of file
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index ad3a7aeae..e243c7405 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -31,6 +31,7 @@ import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';
import { SessionStore } from 'src/app/store/session.service';
import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
+import { RouteService } from 'src/app/services/route.service';
@Component({
selector: 'app-group-messages',
templateUrl: './group-messages.page.html',
@@ -80,7 +81,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
durationDisplay = '';
duration = 0;
showAvatar = true;
- audioPermissionStatus: 'granted'| 'denied' | 'prompt' | null = null
+ audioPermissionStatus: 'granted' | 'denied' | 'prompt' | null = null
sessionStore = SessionStore
isAdmin = false;
constructor(
@@ -102,6 +103,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
private sanitiser: DomSanitizer,
private file: File,
private fileOpener: FileOpener,
+ public RouteService: RouteService,
) {
this.ChatSystemService.getUser()
@@ -114,10 +116,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
};
- this.ChatSystemService.getGroupRoom(this.roomId).loadHistory({});
- this.ChatSystemService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked;
- this.ChatSystemService.openRoom(this.roomId)
- this.groupNameFormart = this.ChatSystemService.getGroupRoom(this.roomId).name.split('-').join(' ')
+ this.open();
setTimeout(() => {
this.scrollToBottomClicked()
@@ -133,6 +132,20 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
+ open() {
+ try {
+ this.ChatSystemService.getGroupRoom(this.roomId).loadHistory({});
+ this.ChatSystemService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked;
+ this.ChatSystemService.openRoom(this.roomId)
+ this.groupNameFormart = this.ChatSystemService.getGroupRoom(this.roomId).name.split('-').join(' ')
+
+ } catch (error) {
+ setTimeout(() => {
+ this.open()
+ }, 3000)
+ }
+ }
+
ngOnInit() {
this.loggedUser = this.loggedUserChat;
@@ -166,7 +179,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
this.scrollChangeCallback = () => this.onContentScrolled(event);
window.addEventListener('scroll', this.scrollChangeCallback, true);
- if(this.room?.customFields?.countDownDate) {
+ if (this.room?.customFields?.countDownDate) {
this.roomCountDownDate = this.timeService.countDownDate(this.room.customFields.countDownDate, this.room._id);
}
}
@@ -249,7 +262,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
if (recordData?.value?.recordDataBase64.includes('data:audio')) {
this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(recordData?.value?.recordDataBase64);
}
- else if(recordData?.value?.mimeType && recordData?.value?.recordDataBase64) {
+ else if (recordData?.value?.mimeType && recordData?.value?.recordDataBase64) {
this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`);
}
});
@@ -290,22 +303,22 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
async startRecording() {
VoiceRecorder.requestAudioRecordingPermission();
- if(await VoiceRecorder.canDeviceVoiceRecord().then((result: GenericResponse) =>{return result.value})){
- if(await VoiceRecorder.requestAudioRecordingPermission().then((result: GenericResponse) => {return result.value})){
+ if (await VoiceRecorder.canDeviceVoiceRecord().then((result: GenericResponse) => { return result.value })) {
+ if (await VoiceRecorder.requestAudioRecordingPermission().then((result: GenericResponse) => { return result.value })) {
//if(await this.hasAudioRecordingPermission()){
- if (this.recording) {
- return;
- }
- this.recording = true;
- VoiceRecorder.startRecording();
- this.calculateDuration();
+ if (this.recording) {
+ return;
+ }
+ this.recording = true;
+ VoiceRecorder.startRecording();
+ this.calculateDuration();
//}
}
- else{
+ else {
this.toastService._badRequest('Para gravar uma mensagem de voz, permita o acesso do Gabinete Digital ao seu microfone.');
}
}
- else{
+ else {
this.toastService._badRequest('Este dispositivo não tem capacidade para gravação de áudio!');
}
}
@@ -388,7 +401,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
- if(SessionStore.user.ChatData.data.userId == this.room.u._id){
+ if (SessionStore.user.ChatData.data.userId == this.room.u._id) {
this.isAdmin = true
} else {
this.isAdmin = false
@@ -534,7 +547,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
else if (res.data == 'edit') {
this.editGroup(this.roomId);
- } else if (res.data == 'addUser') {
+ } else if (res.data == 'addUser') {
this.addContacts();
} else if (res.data == 'delete') {
@@ -796,7 +809,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
_getBase64(file) {
- return new Promise((resolve, reject)=>{
+ return new Promise((resolve, reject) => {
var reader = new FileReader();
reader.readAsDataURL(file);
reader.onload = function () {
@@ -806,7 +819,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
console.log('Error: ', error);
};
})
- }
+ }
async addFileToChat(types: typeof FileType[]) {
@@ -818,7 +831,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") {
- const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch ((error) => {
+ const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch((error) => {
console.error(error);
})));
const blob = this.fileService.base64toBlob(encodedData, file.type)
@@ -909,7 +922,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
async addContacts() {
- if(this.isAdmin) {
+ if (this.isAdmin) {
const modal = await this.modalController.create({
component: GroupContactsPage,
@@ -1011,7 +1024,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
} else {
//Check if modal is opened
if (document.querySelector('.isGroupChatOpened')) {
- await new Promise(resolve => setTimeout(resolve, 5000)).catch ((error) => {
+ await new Promise(resolve => setTimeout(resolve, 5000)).catch((error) => {
console.error(error);
});
await this.serverLongPull();
@@ -1100,9 +1113,9 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}).then((dir) => {
console.log('DIR ', dir)
this.fileOpener
- .open(dir.uri, type)
- .then(() => console.log())
- .catch(e => console.error(e))
+ .open(dir.uri, type)
+ .then(() => console.log())
+ .catch(e => console.error(e))
});
}
@@ -1120,7 +1133,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
async openPreview(msg: MessageService) {
- if(msg?.file?.type === "application/webtrix") {
+ if (msg?.file?.type === "application/webtrix") {
this.viewDocument(msg.file, msg.attachments.image_url)
} else {
if (!msg.attachments[0].image_url || msg.attachments[0].image_url === null || msg.attachments[0].image_url === '') {
@@ -1197,11 +1210,11 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
// set the bytes of the buffer to the correct values
for (var i = 0; i < byteString.length; i++) {
- ia[i] = byteString.charCodeAt(i);
+ ia[i] = byteString.charCodeAt(i);
}
// write the ArrayBuffer to a blob, and you're done
- var blob = new Blob([ab], {type: mimeString});
+ var blob = new Blob([ab], { type: mimeString });
return blob;
}
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index f7ab9fe1d..2d5982a83 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -1,4 +1,4 @@
-
+
-
{{durationDisplay}}
-
+
-
@@ -11,7 +11,8 @@
{{ChatSystemService.getDmRoom(roomId).name}}
-
+
-
-
+
-
-
- {{msg.u.name}}
- {{msg.time}}
-
-
-
-
-
-
-
- {{"Imagem"}}
-
-
+
+
+ {{msg.u.name}}
+ {{msg.time}}
+
+
+
+
+
-
-
- Enviado
-
-
-
-
- Lido
-
-
-
-
+
+
+
+
+ Enviado
+
+
+
+
+ Lido
+
+
-
+
+ {{"Imagem"}}
+
+
+
+ Tentar
+ Tentar
-
+