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/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/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 15b27f49d..2586e8519 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -130,7 +130,7 @@ export class ChatPage implements OnInit { public RouteService: RouteService, ) { - this.headers = new HttpHeaders(); + this.headers = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; window.onresize = (event) => { if (window.innerWidth > 701) { this.modalController.dismiss(); diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index 98f2af49a..debecae07 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -1,313 +1,314 @@ -@import '~src/function.scss'; +@import "~src/function.scss"; :host { // mobile background: var(--background-mobile); } - // desktop @media only screen and (min-width: 1365px) { // set color to body :host { // mobile background: var(--background-desktop) !important ; - } } /* HEADER */ -.bg-blue{ - --background:#0782c9; - background:#0782c9; - --background-color:#0782c9; - background-color:#0782c9; +.bg-blue { + --background: #0782c9; + background: #0782c9; + --background-color: #0782c9; + background-color: #0782c9; color: #ffffff; --color: #ffffff; } -ion-toolbar{ +ion-toolbar { --background: white; } -.ion-text-header-top{ +.ion-text-header-top { width: 100%; --background: transparent; - text-align: center; - padding-top: 15px; - color: #ffffff; + text-align: center; + padding-top: 15px; + color: #ffffff; - /* border: 1px solid red; */ - } - .div-top-header{ - width: 400px; - margin: 0 auto; - background-color: #0782c9; - overflow: auto; - padding-top: 15px; - border: 0!important; + /* border: 1px solid red; */ +} +.div-top-header { + width: 400px; + margin: 0 auto; + background-color: #0782c9; + overflow: auto; + padding-top: 15px; + border: 0 !important; - .div-search{ - font-size: rem(45); - float: left; - margin: 0 0 0 10px - } - .div-logo{ - background: transparent; - width: 140px; - margin: 5px 0 0px 71px; - float: left; - } - .div-logo img{ - width: 100%; - } - .div-profile{ - font-size: rem(45); - float: right; - margin-right: 10px; - } + .div-search { + font-size: rem(45); + float: left; + margin: 0 0 0 10px; } - .ion-text-header-top p{ - --background: transparent; - color: #ffffff; - } - .ion-text-right{ - --background: transparent; - color: #ffffff; - } - .header-large{ - font-family: Arial, Helvetica, sans-serif; - font-size: rem(17); - /* font-weight: 600; */ + .div-logo { background: transparent; - color: #ffffff; + width: 140px; + margin: 5px 0 0px 71px; + float: left; } - .header-xsmall{ - font-family: Arial, Helvetica, sans-serif; - font-size: rem(13); - font-weight: bold; - padding-bottom: 3.5px; - margin-bottom: 3.5px; - border-bottom: 1px solid #ccc; - background: transparent; + .div-logo img { + width: 100%; } - .header-medium{ - font-size: rem(16); - text-align: left; - font-family: roboto; - background: transparent; - margin-right: 5px; - line-height: rem(25); + .div-profile { + font-size: rem(45); + float: right; + margin-right: 10px; } - - .p-small{ - font-size: rem(17); - margin-top: 13px; - color: var(--header-tab-text-white); - margin-right: 25px !important; - text-align: right; - /* color: #ffffff; */ - } - - /* CONTENT */ - .item-list-small{ - font-size: rem(14); - overflow: auto; - } - .ion-item-class{ - padding: 0; - - } - .label-text{ - width: 100%; - padding: 0; - margin: 0; - } - - //DIV - .div-item-Oficial{ - width: 100%; - overflow: auto; - /* border-bottom: 1px solid #ccc; */ - margin: 10px 0 5px 0; - background: #cab0dc; - border-radius: 20px; - padding: 10px; - /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */ - } - .div-item-Pessoal{ - width: 100%; - overflow: auto; - /* border-bottom: 1px solid #ccc; */ - margin: 10px 0 5px 0; - background: #cbeecb; - border-radius: 20px; - padding: 10px; - /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */ - } - .div-up{ - width: 100%; - overflow: auto; - } - .div-up h3{ - margin: 0; - padding: 0; - font-size: rem(17); - width: 100%; - } - .div-icon{ - width: 10%; - font-size: rem(22); - float: left; - color: #808080; - } - .div-icon ion-icon{ - display: block; - margin: 0 auto; - - } - .div-content-Oficial{ - width: 85%; - float: left; - border-left: 4px solid #cab0dc; - padding: 0 0 0 12px; - } - .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{ - font-size: rem(19); - /* border: 1px solid red; */ - } - .div-content-Oficial p, .div-content-Pessoal p{ - font-size: rem(16); - color: rgb(94, 92, 92); - padding: 0 !important; - margin: 0 !important; - } - .div-botton{ - width: 100%; - overflow: auto; - margin: 10px 0 5px 0; - } - .div-botton-left{ - width: 10%; - float: left; - } - .ion-icon-location{ - text-align: center; - display: block; - color: var(--subtitle-text-color); - font-size: rem(16); - margin: 0 auto; - min-height: 19px; - } - .div-botton-middle{ - width: 75%; - float: left; - margin-top: 0.5px; - } - .div-botton-middle p{ - padding: 0; - margin: 0; - } - .div-botton-right{ - width: 10%; - float: left; - margin: 0; - padding: 0; - } - .ion-icon-attach{ - color: #666666; - font-size: rem(20); - } - /* NEW CSS FOR TOGGLE BUTTON */ - .toggleBox{ - margin:20px 20px 0 0; - } - input[type="checkbox"]{ - position: relative; - width: 96px; - height: 34px; - background: #ffffff; - -webkit-appearance: none; - border-radius: 20px; - outline: none; - transition: .4s; - /* box-shadow: inset 0 0 5px rgba(0,0,0,0.2); */ - cursor: pointer; - border:1px solid #e16817; - } - input:checked[type="checkbox"]{ - background: #e16817; - } - input[type="checkbox"]::before{ - z-index: 2; - position: absolute; - content: ""; - left: 0; - width: rem(30); - height: 30px; - 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; - } - input:checked[type="checkbox"]::before{ - left: 65px; - - } - .toggle{ - position: relative; - display: inline; - font-family: 'Montserrat', sans-serif; - display: grid; - text-align: center; - } - label{ - position: absolute; - color: #fff; - font-weight: 600; - font-size: rem(12); - pointer-events: none; - } - .onbtn{ - top:10px; - bottom: 15px; - left: 15px; - /* padding-top: 10px; - border: 1px solid red; */ - } - .ofbtn{ - top:10px; - bottom: 15px; - right: 14px; - color: #e16817; - } - - - -// new -.main{ - padding: 0px em(20px); - background: linear-gradient(270deg, var(--color2) 100%, var(--color3) 100%, var(--color4) 100%, var(--color5) 100%) !important; +} +.ion-text-header-top p { + --background: transparent; + color: #ffffff; +} +.ion-text-right { + --background: transparent; + color: #ffffff; +} +.header-large { + font-family: Arial, Helvetica, sans-serif; + font-size: rem(17); + /* font-weight: 600; */ + background: transparent; + color: #ffffff; +} +.header-xsmall { + font-family: Arial, Helvetica, sans-serif; + font-size: rem(13); + font-weight: bold; + padding-bottom: 3.5px; + margin-bottom: 3.5px; + border-bottom: 1px solid #ccc; + background: transparent; +} +.header-medium { + font-size: rem(16); + text-align: left; + font-family: roboto; + background: transparent; + margin-right: 5px; + line-height: rem(25); } -.event-number{ +.p-small { + font-size: rem(17); + margin-top: 13px; + color: var(--header-tab-text-white); + margin-right: 25px !important; + text-align: right; + /* color: #ffffff; */ +} + +/* CONTENT */ +.item-list-small { + font-size: rem(14); + overflow: auto; +} +.ion-item-class { + padding: 0; +} +.label-text { + width: 100%; + padding: 0; + margin: 0; +} + +//DIV +.div-item-Oficial { + width: 100%; + overflow: auto; + /* border-bottom: 1px solid #ccc; */ + margin: 10px 0 5px 0; + background: #cab0dc; + border-radius: 20px; + padding: 10px; + /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */ +} +.div-item-Pessoal { + width: 100%; + overflow: auto; + /* border-bottom: 1px solid #ccc; */ + margin: 10px 0 5px 0; + background: #cbeecb; + border-radius: 20px; + padding: 10px; + /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */ +} +.div-up { + width: 100%; + overflow: auto; +} +.div-up h3 { + margin: 0; + padding: 0; + font-size: rem(17); + width: 100%; +} +.div-icon { + width: 10%; + font-size: rem(22); + float: left; + color: #808080; +} +.div-icon ion-icon { + display: block; + margin: 0 auto; +} +.div-content-Oficial { + width: 85%; + float: left; + border-left: 4px solid #cab0dc; + padding: 0 0 0 12px; +} +.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 { + font-size: rem(19); + /* border: 1px solid red; */ +} +.div-content-Oficial p, +.div-content-Pessoal p { + font-size: rem(16); + color: rgb(94, 92, 92); + padding: 0 !important; + margin: 0 !important; +} +.div-botton { + width: 100%; + overflow: auto; + margin: 10px 0 5px 0; +} +.div-botton-left { + width: 10%; + float: left; +} +.ion-icon-location { + text-align: center; + display: block; + color: var(--subtitle-text-color); + font-size: rem(16); + margin: 0 auto; + min-height: 19px; +} +.div-botton-middle { + width: 75%; + float: left; + margin-top: 0.5px; +} +.div-botton-middle p { + padding: 0; + margin: 0; +} +.div-botton-right { + width: 10%; + float: left; + margin: 0; + padding: 0; +} +.ion-icon-attach { + color: #666666; + font-size: rem(20); +} +/* NEW CSS FOR TOGGLE BUTTON */ +.toggleBox { + margin: 20px 20px 0 0; +} +input[type="checkbox"] { + position: relative; + width: 96px; + height: 34px; + background: #ffffff; + -webkit-appearance: none; + border-radius: 20px; + outline: none; + transition: 0.4s; + /* box-shadow: inset 0 0 5px rgba(0,0,0,0.2); */ + cursor: pointer; + border: 1px solid #e16817; +} +input:checked[type="checkbox"] { + background: #e16817; +} +input[type="checkbox"]::before { + z-index: 2; + position: absolute; + content: ""; + left: 0; + width: rem(30); + height: 30px; + 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; +} +input:checked[type="checkbox"]::before { + left: 65px; +} +.toggle { + position: relative; + display: inline; + font-family: "Montserrat", sans-serif; + display: grid; + text-align: center; +} +label { + position: absolute; + color: #fff; + font-weight: 600; + font-size: rem(12); + pointer-events: none; +} +.onbtn { + top: 10px; + bottom: 15px; + left: 15px; + /* padding-top: 10px; + border: 1px solid red; */ +} +.ofbtn { + top: 10px; + bottom: 15px; + right: 14px; + color: #e16817; +} + +// new +.main { + padding: 0px em(20px); + background: linear-gradient( + 270deg, + var(--color2) 100%, + var(--color3) 100%, + var(--color4) 100%, + var(--color5) 100% + ) !important; +} + +.event-number { color: var(--header-tab-text-white); font-family: Roboto; font-size: rem(15); - bold{ + bold { font-family: Roboto; font-size: rem(25); text-align: right; color: var(--white); } } -.time{ +.time { font-family: Roboto; text-align: center; color: var(--header-tab-text-white); @@ -316,7 +317,7 @@ ion-toolbar{ width: 100%; } -.next-meeting{ +.next-meeting { display: flex; justify-content: center; margin: 0px 20px; @@ -361,7 +362,7 @@ ion-toolbar{ overflow: auto; padding-bottom: 25px; - .schedule-header{ + .schedule-header { display: flex; margin-bottom: 20px; justify-content: space-between; @@ -371,13 +372,13 @@ ion-toolbar{ display: flex; align-items: center; - .icon{ + .icon { color: #e8e8e8; height: rem(35); width: rem(35); margin-right: 10px; } - .text{ + .text { font-family: Roboto; font-size: rem(20); color: black; @@ -391,29 +392,28 @@ ion-toolbar{ color: #e8e8e8; } } - .content{ + .content { //padding: 0px 20px 20px 20px; overflow: auto; - .item-exp{ + .item-exp { overflow: auto; //padding-top: 5px; //padding-bottom: 5px; padding: 5px 20px 5px 20px; background-color: transparent !important; - } - ion-list{ + ion-list { padding: 0px; margin: 0px; background-color: transparent !important; - .d-flex{ + .d-flex { width: 100%; display: flex; justify-content: space-between; align-items: center; } - ion-item{ + ion-item { padding-bottom: 5px; margin-top: 5px; border-bottom: 1px solid #ebebeb; @@ -422,56 +422,57 @@ ion-toolbar{ align-items: center; background-color: transparent; --background: transparent; - .schedule-time{ + .schedule-time { margin-right: 10px; - .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; color: #797979 !important; font-size: rem(13); } - .schedule-details{ + .schedule-details { display: flex; flex-wrap: wrap; align-items: center; width: 78%; min-height: 39px; align-items: baseline; - .location{ + .location { font-family: Roboto; font-size: rem(15); color: black; min-height: 19px; width: 100%; - - } - .description{ - width: 100%; + .description { font-family: Roboto; font-size: rem(13); font-weight: bold; + max-width: 200px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; //color: #0d89d1; - color: var(--title-text-color) + color: var(--title-text-color); } - .description p{ + .description p { white-space: nowrap; overflow: hidden !important; text-overflow: ellipsis !important; } } - .color{ + .color { width: 5px; height: rem(40); border-top-right-radius: 5px; @@ -479,16 +480,15 @@ ion-toolbar{ background-color: #f05d5e; } } - ion-item:last-child{ + ion-item:last-child { border-bottom: unset !important; padding-bottom: unset !important; } } - } - .resume{ - .title{ + .resume { + .title { font-family: Roboto; font-size: rem(15); font-weight: 500; @@ -496,30 +496,27 @@ ion-toolbar{ margin-bottom: 5px; margin-top: 10px; } - .event-num, .first-event-time{ + .event-num, + .first-event-time { font-family: Roboto; font-size: rem(15); display: block; color: black; } } - } .d-flex { display: flex; } -.pointer{ +.pointer { cursor: pointer; } - - - @media only screen and (max-width: 856px) { - - .content, .conteiner-box { + .content, + .conteiner-box { height: unset !important; max-height: unset !important; } @@ -535,7 +532,7 @@ ion-toolbar{ .schedule-1 { display: none; } - .filters-box { + .filters-box { display: block !important; width: 100%; } @@ -558,36 +555,30 @@ ion-toolbar{ .box-container { height: unset !important; } - } - @media only screen and (min-width: 804px) { - .schedule:first-child { margin-right: 2%; - } } @media only screen and (min-width: 478px) { - .schedule{ + .schedule { width: 400px; } } - @media only screen and (max-width: 478px) { - .schedule{ + .schedule { width: 360px; } } -ion-title{ +ion-title { border: 1px solid red; text-overflow: ellipsis; } - .box-container { background-color: white; flex-direction: column; @@ -606,7 +597,7 @@ ion-title{ background-color: #ffb81c2b; width: 150px; height: 90px; - margin:5px; + margin: 5px; margin-left: 0px; margin-right: 0px; flex-direction: column; @@ -618,7 +609,7 @@ ion-title{ -ms-border-radius: 10px; -o-border-radius: 10px; padding: 10px; - p{ + p { margin-bottom: 0px; line-height: 15px; } @@ -638,8 +629,6 @@ ion-title{ width: 100%; } - - .schedule-container { flex-grow: 1; overflow: auto; @@ -649,19 +638,15 @@ ion-title{ width: unset !important; max-width: unset !important; } - ion-item{ + ion-item { border-bottom: unset !important; } } - .conteiner-box-mobile { display: none; } - - - @media screen and (max-width: 400px) { .box-container { width: 360px; @@ -671,8 +656,6 @@ ion-title{ } } - - .item-exp { justify-content: flex-start !important; } @@ -681,20 +664,20 @@ ion-title{ justify-content: flex-start !important; } - - @media only screen and (min-width: 100px) { - - .container-filters, .filters-box, .schedule-header, .Goto-agenda{ + .container-filters, + .filters-box, + .schedule-header, + .Goto-agenda { font-size: 14px; } - } @media only screen and (min-width: 500px) { - - .container-filters, .filters-box, .schedule-header, .Goto-agenda { + .container-filters, + .filters-box, + .schedule-header, + .Goto-agenda { font-size: 16px; } } - diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.scss b/src/app/pages/gabinete-digital/event-list/event-list.page.scss index 68de899f3..76441f356 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.scss +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.scss @@ -121,7 +121,12 @@ ion-item-sliding{ color: var(--title-text-color) !important; margin: 0; padding: 0; + max-width: 200px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } + .test{ color: #000 !important; border: 1px solid red !important; diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss index 86a7097f3..e20a686c3 100644 --- a/src/app/pages/publications/publications.page.scss +++ b/src/app/pages/publications/publications.page.scss @@ -1,24 +1,24 @@ -@import '~src/function.scss'; +@import "~src/function.scss"; @media only screen and (min-width: 100px) { - :host{ + :host { font-size: 14px; } } @media only screen and (min-width: 500px) { - :host{ + :host { font-size: rem(16); } } -:host{ +:host { // background: #0782c9; } -ion-content{ +ion-content { --background: transparent; } -ion-toolbar{ +ion-toolbar { border-width: 0 !important; --padding-top: 0px !important; --padding-start: 0px !important; @@ -26,249 +26,251 @@ ion-toolbar{ --padding-end: 0px !important; } -.div-top-header{ - margin: 0 auto; - background-color: #0782c9; - overflow: auto; - padding-top: 15px; - border: 0!important; +.div-top-header { + margin: 0 auto; + background-color: #0782c9; + overflow: auto; + padding-top: 15px; + border: 0 !important; - .div-search{ - font-size: rem(45); - float: left; - margin: 0 0 0 10px - } - .div-logo{ - background: transparent; - width: 140px; - margin: 5px 0 0px 71px; - float: left; - } - .div-logo img{ - width: 100%; - } - .div-profile{ - font-size: rem(45); - float: right; - margin-right: 10px; - } + .div-search { + font-size: rem(45); + float: left; + margin: 0 0 0 10px; } - - ion-content{ - // --background:#0782c9; - --border: none; + .div-logo { + background: transparent; + width: 140px; + margin: 5px 0 0px 71px; + float: left; } - .main-header{ - width: 100%; /* 400px */ - height: 100%; - font-family: Roboto; - background-color: #fff; - overflow:hidden; - color:#000; - transform: translate3d(0, 1px, 0); - - .title-content{ - margin: 0px auto; - padding: 0 !important; - background: #fff; - } - .div-title{ - padding: 0!important; - } - .div-icon{ - display: flex; - /* width: rem(45); - float: right; */ - font-size: rem(35); - padding: 0 !important; - align-items: center; - justify-content: flex-end; - } - .div-icon ion-icon{ - float: right; - padding-left: 10px; - } + .div-logo img { + width: 100%; } - .main-content{ - font-family: Roboto; - background-color: #fff; - overflow:auto; - - .aside-left{ - border-right: 1px solid #d8d8d8; - margin: 0 !important; - padding: 0 !important; - - .main-header{ - overflow: inherit !important; - padding: 30px 20px 15px 20px !important; - } - - .aside{ - //padding: 0px 20px 0 20px !important; - } - } - .content{ - //border: 1px solid red; - } - } - ion-item{ - --background: transparent; - } - .item{ - width: 100% !important; - padding: 0px 20px 0 20px !important; - border-bottom: 1px solid #ebebeb; - align-items: center; - justify-content: space-between; - flex-direction: row; - background-color: transparent; - overflow: auto; - - .item-icon{ - //margin-top: 28px; - width: rem(45); - float: left; - font-size: rem(40); - - .item-icon ion-icon{ - color: #061b52; - } - } - .item-icon2{ - //margin-top: 23px; - float: left; - } - - .item-content{ - width: 100%; - padding: 15px 0 15px 10px; - overflow: auto; - margin-right: 5px; - - p{ - white-space: nowrap; - overflow: hidden !important; - text-overflow: ellipsis !important; - } - - .item-content-date{ - color: #797979; - margin: 0 !important; - padding: 0 !important; - } - .item-content-title{ - color: var(--title-text-color); - margin: 0 !important; - padding: 0 !important; - } - .item-content-detail{ - color: #000000; - font-size: rem(15); - margin: 0 !important; - padding: 0 !important; - } - .item-options{ - color: var(--box-hover-background-color); - width: rem(25); - font-size: rem(20); - } - .item-content-date-active, .item-content-title-active, .item-content-detail-active{ - color: #fff; - } - } - .item-options-active{ - display: none !important; - } - } - - .item-active{ - background-color: var(--gabinete-active-hove-background) !important; - color: #fff !important; - pointer-events: none; - } - - .item:hover{ - background-color: var(--box-hover-background-color); - } - - ion-item-options{ - border: 1px solid #fff; - overflow: auto; - } - - ion-item-option{ - display: flex; - background: #ffe0e0; - align-items: center; - align-content: center; - } - - .delete-option{ - display: flex; - background: #ffe0e0; - align-items: center; - align-content: center; - border: 1px solid #d30a0a67; - } - - .edit-option{ - display: flex; - background: #fff; - align-items: center; - align-content: center; - margin-right: 5px !important; - border: 1px solid #42b9feb9; - } - - .edit{ - padding: 6px; - font-size: rem(35); - color:#061b52; - border-radius: 20px; - margin: 7px; - } - .delete{ - padding: 7px; - font-size: rem(21); - color:#d30a0a; - border-radius: 20px; - margin: 12px; - border: 1px solid #d30a0a; - } - - - - - -@media only screen and (min-width: 701px) { - .content-right{ - display: flex !important; - width: 65%; - } - .aside-left{ - width: 35%; - } - .item-options{ - display: block !important; - padding: 10px; - + .div-profile { + font-size: rem(45); + float: right; + margin-right: 10px; } } +ion-content { + // --background:#0782c9; + --border: none; +} +.main-header { + width: 100%; /* 400px */ + height: 100%; + font-family: Roboto; + background-color: #fff; + overflow: hidden; + color: #000; + transform: translate3d(0, 1px, 0); + .title-content { + margin: 0px auto; + padding: 0 !important; + background: #fff; + } + .div-title { + padding: 0 !important; + } + .div-icon { + display: flex; + /* width: rem(45); + float: right; */ + font-size: rem(35); + padding: 0 !important; + align-items: center; + justify-content: flex-end; + } + .div-icon ion-icon { + float: right; + padding-left: 10px; + } +} +.main-content { + font-family: Roboto; + background-color: #fff; + overflow: auto; + + .aside-left { + border-right: 1px solid #d8d8d8; + margin: 0 !important; + padding: 0 !important; + + .main-header { + overflow: inherit !important; + padding: 30px 20px 15px 20px !important; + } + + .aside { + //padding: 0px 20px 0 20px !important; + } + } + .content { + //border: 1px solid red; + } +} +ion-item { + --background: transparent; +} +.item { + width: 100% !important; + padding: 0px 20px 0 20px !important; + border-bottom: 1px solid #ebebeb; + align-items: center; + justify-content: space-between; + flex-direction: row; + background-color: transparent; + overflow: auto; + + .item-icon { + //margin-top: 28px; + width: rem(45); + float: left; + font-size: rem(40); + + .item-icon ion-icon { + color: #061b52; + } + } + .item-icon2 { + //margin-top: 23px; + float: left; + } + + .item-content { + width: 100%; + padding: 15px 0 15px 10px; + overflow: auto; + margin-right: 5px; + + p { + white-space: nowrap; + overflow: hidden !important; + text-overflow: ellipsis !important; + } + + .item-content-date { + color: #797979; + margin: 0 !important; + padding: 0 !important; + } + .item-content-title { + color: var(--title-text-color); + margin: 0 !important; + padding: 0 !important; + max-width: 200px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + .item-content-detail { + color: #000000; + font-size: rem(15); + margin: 0 !important; + padding: 0 !important; + } + .item-options { + color: var(--box-hover-background-color); + width: rem(25); + font-size: rem(20); + } + .item-content-date-active, + .item-content-title-active, + .item-content-detail-active { + color: #fff; + } + } + .item-options-active { + display: none !important; + } +} + +.item-active { + background-color: var(--gabinete-active-hove-background) !important; + color: #fff !important; + pointer-events: none; +} + +.item:hover { + background-color: var(--box-hover-background-color); +} + +ion-item-options { + border: 1px solid #fff; + overflow: auto; +} + +ion-item-option { + display: flex; + background: #ffe0e0; + align-items: center; + align-content: center; +} + +.delete-option { + display: flex; + background: #ffe0e0; + align-items: center; + align-content: center; + border: 1px solid #d30a0a67; +} + +.edit-option { + display: flex; + background: #fff; + align-items: center; + align-content: center; + margin-right: 5px !important; + border: 1px solid #42b9feb9; +} + +.edit { + padding: 6px; + font-size: rem(35); + color: #061b52; + border-radius: 20px; + margin: 7px; +} +.delete { + padding: 7px; + font-size: rem(21); + color: #d30a0a; + border-radius: 20px; + margin: 12px; + border: 1px solid #d30a0a; +} + +@media only screen and (min-width: 701px) { + .content-right { + display: flex !important; + width: 65%; + } + .aside-left { + width: 35%; + } + .item-options { + display: block !important; + padding: 10px; + } +} @media only screen and (min-width: 100px) { - - .item-icon2, .title-content, .main-content, .item { + .item-icon2, + .title-content, + .main-content, + .item { font-size: 14px; } } @media only screen and (min-width: 500px) { - - .item-icon2, .title-content, .main-content, .item { + .item-icon2, + .title-content, + .main-content, + .item { font-size: 16px; } } - diff --git a/src/app/services/attachments.service.ts b/src/app/services/attachments.service.ts index 1bfc771eb..94fc3316f 100644 --- a/src/app/services/attachments.service.ts +++ b/src/app/services/attachments.service.ts @@ -32,7 +32,7 @@ export class AttachmentsService { setHeader() { this.loggeduser = SessionStore.user - this.headers = new HttpHeaders(); + this.headers = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; this.headers = this.headers.set('Authorization', SessionStore.user.BasicAuthKey); } diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index 83e35c984..77342fa55 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -27,21 +27,21 @@ import { CPSession } from '../store/documentManagement'; export class AuthService { userData$ = new BehaviorSubject(''); userId$ = new BehaviorSubject(''); - headers: HttpHeaders = new HttpHeaders(); - public wsValidatedUserChat:any; + headers: HttpHeaders = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized }); + public wsValidatedUserChat: any; public isWsAuthenticated: boolean = false; - opts:any; + opts: any; tabIsActive = true constructor( private http: HttpClient, - private storageService:StorageService, + private storageService: StorageService, public alertController: AlertController, private aesencrypt: AESEncrypt, private RochetChatConnectorService: RochetChatConnectorService, private router: Router, - private NfService:NfService, + private NfService: NfService, private processesService: ProcessesService, private AttachmentsService: AttachmentsService, private storage: Storage, @@ -51,245 +51,245 @@ export class AuthService { private httpErroHandle: HttpErrorHandle, private errorHandler: ErrorHandler) { - if (SessionStore.exist) { - if(this.p.userPermission(this.p.permissionList.Chat.access) == true ) { - this.loginToChatWs() - } - + if (SessionStore.exist) { + if (this.p.userPermission(this.p.permissionList.Chat.access) == true) { + this.loginToChatWs() } - window.addEventListener('focus', (event) => { - if(!this.tabIsActive) { - this.tabIsActive = true - const data = SessionStore.getDataFromLocalStorage(); - - if(!data?.user?.Authorization && SessionStore?.user?.Authorization) { - window.location.reload(); - } - - if(window['all-process-gabinete']) { - window['all-process-gabinete']() - } - } - }); - - window.addEventListener('blur', (event) => { - this.tabIsActive = false - }); - } - async login(user: UserForm, {saveSession = true}): Promise { - user.BasicAuthKey = 'Basic ' + btoa(user.username + ':' + this.aesencrypt.encrypt(user.password,user.username )); + window.addEventListener('focus', (event) => { + if (!this.tabIsActive) { + this.tabIsActive = true + const data = SessionStore.getDataFromLocalStorage(); - this.headers = this.headers.set('Authorization', user.BasicAuthKey); - this.opts = { - headers: this.headers, - } - - let response: any; - - try { - response = await this.http.post(environment.apiURL + "UserAuthentication/Login", '', this.opts).toPromise(); - - - if(saveSession) { - this.SetSession(response, user) + if (!data?.user?.Authorization && SessionStore?.user?.Authorization) { + window.location.reload(); } - } catch (error) { - this.errorHandler.handleError(error); - this.httpErroHandle.loginHttpStatusHandle(error) - captureException(error); - } finally { + + if (window['all-process-gabinete']) { + window['all-process-gabinete']() + } + } + }); + + window.addEventListener('blur', (event) => { + this.tabIsActive = false + }); + + } + + async login(user: UserForm, { saveSession = true }): Promise { + user.BasicAuthKey = 'Basic ' + btoa(user.username + ':' + this.aesencrypt.encrypt(user.password, user.username)); + + this.headers = this.headers.set('Authorization', user.BasicAuthKey); + this.opts = { + headers: this.headers, + } + + let response: any; + + try { + response = await this.http.post(environment.apiURL + "UserAuthentication/Login", '', this.opts).toPromise(); + + + if (saveSession) { + this.SetSession(response, user) + } + } catch (error) { + this.errorHandler.handleError(error); + this.httpErroHandle.loginHttpStatusHandle(error) + captureException(error); + } finally { + return response + } + + } + + async loginContenteProduction(user: UserForm, { saveSession = true }): Promise { + user.BasicAuthKey = 'Basic ' + btoa(user.username + ':' + this.aesencrypt.encrypt(user.password, user.username)); + + this.headers = this.headers.set('Authorization', user.BasicAuthKey); + this.opts = { + headers: this.headers, + } + + let response: any; + + try { + response = await this.http.post(environment.apiURL + "UserAuthentication/LoginJwt", '', this.opts).toPromise(); + console.log('JWT', response) + + if (saveSession) { + /* this.SetSession(response, user) */ + console.log('teste', response); + return response - } + } + } catch (error) { + this.httpErroHandle.httpStatusHandle(error) + } finally { + return response } - async loginContenteProduction(user: UserForm, {saveSession = true}): Promise { - user.BasicAuthKey = 'Basic ' + btoa(user.username + ':' + this.aesencrypt.encrypt(user.password,user.username )); + } - this.headers = this.headers.set('Authorization', user.BasicAuthKey); - this.opts = { - headers: this.headers, + // async UpdateLogin() {} + + SetSession(response: LoginUserRespose, user: UserForm) { + const session: UserSession = Object.assign(SessionStore.user, response) + + if (response) { + if (session.RoleID == 100000014) { + session.Profile = 'PR' + } else if (session.RoleID == 100000011) { + session.Profile = 'MDGPR' + } else if (session.RoleID == 99999872) { + session.Profile = 'Consultant' + } else if (session.RoleID == 99999886) { + session.Profile = 'SGGPR' + } else { + session.Profile = 'Unknown' } - let response: any; - - try { - response = await this.http.post(environment.apiURL + "UserAuthentication/LoginJwt", '', this.opts).toPromise(); - console.log('JWT',response) - - if(saveSession) { - /* this.SetSession(response, user) */ - console.log('teste', response); - - return response - - } - } catch (error) { - this.httpErroHandle.httpStatusHandle(error) - } finally { - return response - } + session.Password = user.password + session.BasicAuthKey = user.BasicAuthKey + SessionStore.reset(session) + return true; } - // async UpdateLogin() {} + this.initialsService.getInitials(session.FullName); + } - SetSession(response: LoginUserRespose, user:UserForm) { - const session: UserSession = Object.assign(SessionStore.user, response) + loginToChatWs() { + setTimeout(() => { - if (response) { - if( session.RoleID == 100000014) { - session.Profile = 'PR' - } else if(session.RoleID == 100000011) { - session.Profile = 'MDGPR' - } else if(session.RoleID == 99999872) { - session.Profile = 'Consultant' - } else if(session.RoleID == 99999886) { - session.Profile = 'SGGPR' - }else { - session.Profile = 'Unknown' - } + if (SessionStore.user.ChatData?.data) { + this.RochetChatConnectorService.connect(); + this.RochetChatConnectorService.login().then((message: any) => { - session.Password = user.password - session.BasicAuthKey = user.BasicAuthKey - SessionStore.reset(session) - - return true; - } - - this.initialsService.getInitials(session.FullName); - } - - loginToChatWs() { - setTimeout(() => { - - if(SessionStore.user.ChatData?.data) { - this.RochetChatConnectorService.connect(); - this.RochetChatConnectorService.login().then((message: any) => { - - SessionStore.user.RochetChatUserId = message.result.id - SessionStore.save() + SessionStore.user.RochetChatUserId = message.result.id + SessionStore.save() + this.RochetChatConnectorService.setStatus('online') + window['RochetChatConnectorService'] = this.RochetChatConnectorService + setTimeout(() => { + this.ChatSystemService.getAllRooms(); this.RochetChatConnectorService.setStatus('online') - window['RochetChatConnectorService'] = this.RochetChatConnectorService - setTimeout(() => { - this.ChatSystemService.getAllRooms(); - this.RochetChatConnectorService.setStatus('online') - }, 200); + }, 200); - }).catch((error) => { - // console.error(SessionStore.user.ChatData, 'web socket login',error) - }) - } + }).catch((error) => { + // console.error(SessionStore.user.ChatData, 'web socket login',error) + }) + } - // before sending a message with a attachment - this.NfService.beforeSendAttachment = async (message: MessageService, room?: RoomService) => { + // before sending a message with a attachment + this.NfService.beforeSendAttachment = async (message: MessageService, room?: RoomService) => { - if(message.hasFile) { - if(message.file.type != 'application/webtrix') { - const formData = message.temporaryData + if (message.hasFile) { + if (message.file.type != 'application/webtrix') { + const formData = message.temporaryData - try { - let guid: any = await this.AttachmentsService.uploadFile(formData).toPromise() - message.file.guid = guid.path + try { + let guid: any = await this.AttachmentsService.uploadFile(formData).toPromise() + message.file.guid = guid.path - message.downloadFileMsg() - message.uploadingFile = false + message.downloadFileMsg() + message.uploadingFile = false - return true - } catch(e) { - window['e'] = e - console.error('BeforesendAtachment', e) - message.uploadingFile = false - return false - } + return true + } catch (e) { + window['e'] = e + console.error('BeforesendAtachment', e) + message.uploadingFile = false + return false + } - } else { - try { - const res = message.temporaryData + } else { + try { + const res = message.temporaryData - let url = await this.processesService.GetDocumentUrl(res.data.selected.Id, res.data.selected.ApplicationType).toPromise(); + let url = await this.processesService.GetDocumentUrl(res.data.selected.Id, res.data.selected.ApplicationType).toPromise(); - let url_no_options: string = url.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); - message.attachments[0].title_link = url_no_options - message.attachments[0].message_link = url_no_options + let url_no_options: string = url.replace("webTRIX.Viewer", "webTRIX.Viewer.Branch1"); + message.attachments[0].title_link = url_no_options + message.attachments[0].message_link = url_no_options - message.uploadingFile = false + message.uploadingFile = false - return true - } catch(e) { - window['e'] = e - console.error('BeforesendAtachment', e) - message.uploadingFile = false - return false - } + return true + } catch (e) { + window['e'] = e + console.error('BeforesendAtachment', e) + message.uploadingFile = false + return false } } + } + return false + } + + this.NfService.downloadFileMsg = async (message: MessageService, room?: RoomService) => { + + // + let downloadFile = ""; + if (message.file.type == "application/img") { + const event: any = await this.AttachmentsService.downloadFile(message.file.guid).toPromise(); + + if (event.type === HttpEventType.DownloadProgress) { + //this.downloadProgess = Math.round((100 * event.loaded) / event.total); + return true + } else if (event.type === HttpEventType.Response) { + downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), '')); + + message.file = { + guid: message.file.guid, + image_url: downloadFile, + type: message.file.type + } + + return true + } return false } + }; - this.NfService.downloadFileMsg = async (message: MessageService, room?: RoomService) => { + }, 1) + } - // - let downloadFile = ""; - if (message.file.type == "application/img") { - const event: any = await this.AttachmentsService.downloadFile(message.file.guid).toPromise(); + autologout(expirationDate: number) { + setTimeout(() => { + this.logout(); + }, expirationDate) + } - if (event.type === HttpEventType.DownloadProgress) { - //this.downloadProgess = Math.round((100 * event.loaded) / event.total); - return true - } else if (event.type === HttpEventType.Response) { - downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), '')); + logout() { - message.file = { - guid: message.file.guid, - image_url: downloadFile, - type: message.file.type - } + SessionStore.setInativity(false) + SessionStore.setUrlBeforeInactivity(this.router.url); + setTimeout(() => { + this.router.navigateByUrl('/', { replaceUrl: true }); + }, 100) - return true - } - return false - } - }; + } - }, 1) - } + logoutChat() { + } - autologout(expirationDate:number) { - setTimeout(() => { - this.logout(); - }, expirationDate) - } + async presentAlert(message: string) { + const alert = await this.alertController.create({ + cssClass: 'my-custom-class', + header: 'Mensagem do sistema', + message: message, + buttons: ['OK'] + }); - logout() { - - SessionStore.setInativity(false) - SessionStore.setUrlBeforeInactivity(this.router.url); - setTimeout(() => { - this.router.navigateByUrl('/', { replaceUrl: true }); - }, 100) - - } - - logoutChat() { - } - - async presentAlert(message: string) { - const alert = await this.alertController.create({ - cssClass: 'my-custom-class', - header: 'Mensagem do sistema', - message: message, - buttons: ['OK'] - }); - - await alert.present(); - } + await alert.present(); + } } diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts index 4cad96dc2..a409bb498 100644 --- a/src/app/services/chat.service.ts +++ b/src/app/services/chat.service.ts @@ -40,7 +40,7 @@ export class ChatService { } getDocumentDetails(url: string) { - let headersc = new HttpHeaders(); + let headersc = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; headersc = headersc.set('X-User-Id', SessionStore.user.ChatData.data.userId); headersc = headersc.set('X-Auth-Token', SessionStore.user.ChatData.data.authToken); headersc = headersc.set('Sec-Fetch-Dest', 'attachment'); @@ -350,7 +350,7 @@ export class ChatService { try { if (this.p.userPermission(this.p.permissionList.Chat.access) && SessionStore.user.ChatData) { - this.headers = new HttpHeaders(); + this.headers = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; if (this.p.userPermission(this.p.permissionList.Chat.access)) { // diff --git a/src/app/services/contacts.service.ts b/src/app/services/contacts.service.ts index 603c91dc7..d8ac76fb7 100644 --- a/src/app/services/contacts.service.ts +++ b/src/app/services/contacts.service.ts @@ -36,7 +36,7 @@ export class ContactsService { setHeader() { this.loggeduser = SessionStore.user; - this.headers = new HttpHeaders(); + this.headers = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); } diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 88fdb6bcf..ebbf480f7 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -82,22 +82,22 @@ export class EventsService { async setHeader () { - this.headers = new HttpHeaders(); - this.headersMdOficial = new HttpHeaders(); - this.headersMdPessoal = new HttpHeaders(); + this.headers = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; + this.headersMdOficial = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; + this.headersMdPessoal = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; - this.headersPrOficial = new HttpHeaders(); - this.headersPrPessoal = new HttpHeaders(); + this.headersPrOficial = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; + this.headersPrPessoal = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; - this.headersSharedOficial = new HttpHeaders(); - this.headersSharedPessoal = new HttpHeaders(); + this.headersSharedOficial = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; + this.headersSharedPessoal = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; - this.headerOwnOficial= new HttpHeaders(); - this.headerOwnPessoal= new HttpHeaders(); + this.headerOwnOficial= new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; + this.headerOwnPessoal= new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; - this.headerSharedOficial= new HttpHeaders(); - this.headerSharedPessoal= new HttpHeaders(); + this.headerSharedOficial= new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; + this.headerSharedPessoal= new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; this.headers = this.headers.set('Authorization', SessionStore.user.BasicAuthKey); @@ -377,7 +377,7 @@ export class EventsService { } makeHeader(calendar: calendarInterface) { - let header = new HttpHeaders(); + let header = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; header = header.set('Authorization', SessionStore.user.BasicAuthKey); header = header.set('CalendarId', calendar.CalendarId); header = header.set('CalendarRoleId', calendar.CalendarRoleId); @@ -615,7 +615,7 @@ export class EventsService { let result = [] for(let agendasCalendar of agendasCalendars) { - var header = new HttpHeaders(); + var header = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; header = header.set('Authorization', SessionStore.user.BasicAuthKey); header = header.set('CalendarId', agendasCalendar.CalendarId); header = header.set('CalendarRoleId', agendasCalendar.CalendarRoleId); @@ -648,7 +648,7 @@ export class EventsService { for (let sharedCalendar of SessionStore.user.SharedCalendars) { - var header = new HttpHeaders(); + var header = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; header = header.set('Authorization', SessionStore.user.BasicAuthKey); header = header.set('CalendarId', sharedCalendar.CalendarId); header = header.set('CalendarRoleId', sharedCalendar.CalendarRoleId); diff --git a/src/app/services/http.service.ts b/src/app/services/http.service.ts index c994ced1a..6b5859a4c 100644 --- a/src/app/services/http.service.ts +++ b/src/app/services/http.service.ts @@ -10,7 +10,7 @@ export class HttpService { constructor(private http:HttpClient) { } post(serviceName:string, data:any){ - const headers = new HttpHeaders(); + const headers = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; const options = {header: headers, withCredentials: false}; const url = environment.apiChatUrl+serviceName; const body = {"user": "admin","password": "tabteste@006"}; diff --git a/src/app/services/organic-entity.service.ts b/src/app/services/organic-entity.service.ts index 2a5e6c512..6a8e8e791 100644 --- a/src/app/services/organic-entity.service.ts +++ b/src/app/services/organic-entity.service.ts @@ -31,7 +31,7 @@ export class OrganicEntityService { setHeader() { this.loggeduser = SessionStore.user; - this.headers = new HttpHeaders(); + this.headers = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); } diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 73890a34a..c812ec70d 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -44,11 +44,11 @@ export class ProcessesService { setHeader() { - this.headers = new HttpHeaders(); + this.headers = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); - this.headers2 = new HttpHeaders(); + this.headers2 = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; this.headers2 = this.headers2.set('Authorization', "Bearer " + CPSession.AuthorizationJwt); diff --git a/src/app/services/publications.service.ts b/src/app/services/publications.service.ts index bf9edb752..02ac38228 100644 --- a/src/app/services/publications.service.ts +++ b/src/app/services/publications.service.ts @@ -36,7 +36,7 @@ export class PublicationsService { setHeader () { this.loggeduser = SessionStore.user; - this.headers = new HttpHeaders(); + this.headers = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); } diff --git a/src/app/services/search.service.ts b/src/app/services/search.service.ts index a19b720a1..184aded5d 100644 --- a/src/app/services/search.service.ts +++ b/src/app/services/search.service.ts @@ -37,7 +37,7 @@ export class SearchService { setHeader() { this.loggeduser = SessionStore.user; - this.headers = new HttpHeaders(); + this.headers = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); } diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index ace5456ea..adeb99884 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -67,8 +67,8 @@ required [disabled]=true > - Calendário Oficial - Calendário Pessoal + Agenda Oficial + Agenda Pessoal diff --git a/src/app/shared/agenda/event-list/event-list.page.scss b/src/app/shared/agenda/event-list/event-list.page.scss index d1d5147f4..1b56f0a3f 100644 --- a/src/app/shared/agenda/event-list/event-list.page.scss +++ b/src/app/shared/agenda/event-list/event-list.page.scss @@ -103,6 +103,10 @@ color: var(--title-text-color); margin: 0; padding: 0; + max-width: 200px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } } diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index cea4ac40a..03359d413 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -58,10 +58,10 @@ - Calendário Oficial + Agenda Oficial - Calendário Pessoal + Agenda Pessoal diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss index 303219235..4d7211b82 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss @@ -1,122 +1,125 @@ -@import '~src/function.scss'; +@import "~src/function.scss"; -:host{ - margin: 0; +:host { + margin: 0; } -.title-container{ +.title-container { margin-bottom: 15px; - .title-icon{ + .title-icon { float: right; margin-right: 20px; font-size: rem(30); color: #42b9fe; } } -.title{ +.title { padding: 30px 20px 0 20px !important; - font-family: Roboto; - font-size: rem(25); - color:#000; + font-family: Roboto; + font-size: rem(25); + color: #000; + overflow: auto; +} +ion-item-sliding { + margin-top: 5px; +} +.main-content { + padding: 0px 20px 0 20px !important; + margin-top: 20px; + .item { + --inner-padding-end: 0 !important; + --inner-padding-top: 10px; + --inner-padding-bottom: 10px; + } + .event-pr-Oficial { + background-color: var(--white); + border-radius: 5px; + border-right: 5px solid #99e47b; overflow: auto; } - ion-item-sliding{ - margin-top: 5px; + .event-pr-Pessoal { + background-color: var(--white); + border-radius: 5px; + border-right: 5px solid #958bfc; + overflow: auto; + } + .event-mdgpr-Oficial { + border-radius: 5px; + border-right: 5px solid var(--label-bg-color); + overflow: auto; + } + .event-mdgpr-Pessoal { + border-radius: 5px; + border-right: 5px solid #f05d5e; + overflow: auto; + } + .approve-event-time { + float: left; + } + .approve-event-time p { + width: 33px; + font-family: Roboto; + font-size: rem(13); + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: var(--Antartic-grey); + margin: 0; + padding-bottom: 10px; + } + .approve-event-detail { + float: left; + margin-left: 10px; + } + .approve-event-detail .p { + //width: 250px; + font-family: Roboto; + font-size: rem(13); + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: var(--black); + margin: 0; + padding-bottom: 10px; + } + .approve-event-detail .h3 { + font-family: Roboto; + font-size: rem(15); + font-weight: bold; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: var(--title-text-color); + margin: 0; + padding: 0; + max-width: 200px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } - .main-content{ - padding: 0px 20px 0 20px !important; - margin-top: 20px; - .item{ - --inner-padding-end: 0 !important; - --inner-padding-top: 10px; - --inner-padding-bottom:10px; - } - .event-pr-Oficial{ - background-color: var(--white); - border-radius: 5px; - border-right: 5px solid #99e47b; - overflow: auto; - } - .event-pr-Pessoal{ - background-color: var(--white); - border-radius: 5px; - border-right: 5px solid #958bfc; - overflow: auto; - } - .event-mdgpr-Oficial{ - border-radius: 5px; - border-right: 5px solid var(--label-bg-color); - overflow: auto; - } - .event-mdgpr-Pessoal{ - border-radius: 5px; - border-right: 5px solid #f05d5e; - overflow: auto; - } - .approve-event-time{ - float: left; - } - .approve-event-time p{ - width: 33px; - font-family: Roboto; - font-size: rem(13); - font-weight: normal; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: var(--Antartic-grey); - margin: 0; - padding-bottom: 10px; - } - .approve-event-detail{ - float: left; - margin-left: 10px; - } - .approve-event-detail .p{ - //width: 250px; - font-family: Roboto; - font-size: rem(13); - font-weight: normal; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: var(--black); - margin: 0; - padding-bottom: 10px; - } - .approve-event-detail .h3{ - font-family: Roboto; - font-size: rem(15); - font-weight: bold; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: var(--title-text-color);; - margin: 0; - padding: 0; - } } - /* New CSS */ -.expediente{ +.expediente { border-radius: 15px; box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); - border:1px solid #e9e9e9 !important; + border: 1px solid #e9e9e9 !important; background-color: var(--white); margin-bottom: 10px !important; padding: 15px; } -.exp-list-item{ +.exp-list-item { //width: 368px; overflow: auto; /* border-bottom: 1px solid gray; */ margin: 10px auto; } -.exp-top-detail{ +.exp-top-detail { width: 100%; float: left; font-family: Roboto; @@ -125,51 +128,51 @@ color: var(--title-text-color); padding-left: 3px; - .subject{ + .subject { width: 84%; float: left; } - .exp-icon{ + .exp-icon { width: fit-content; float: right; - /* font-size: rem(13); */ + /* font-size: rem(13); */ margin: 0 !important; padding: 0 !important; - ion-icon{ + ion-icon { font-size: rem(16); color: #42b9fe; float: left; } - label{ + label { font-size: rem(13); } } } -.exp-middle-detail, .exp-bottom-detail{ +.exp-middle-detail, +.exp-bottom-detail { margin-bottom: 5px; - } -.exp-middle-detail{ +.exp-middle-detail { font-size: rem(16); width: 100%; overflow: auto; - .exp-workflow{ + .exp-workflow { float: left; margin: 0 !important; - .label{ + .label { border-radius: 15px; background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; color: black; + } } - } - .exp-date{ + .exp-date { width: auto; font-family: Roboto; font-size: rem(13); @@ -182,49 +185,49 @@ float: right; } } -.exp-bottom-detail{ +.exp-bottom-detail { font-size: rem(10); width: 100%; overflow: auto; padding-left: 3px; - .exp-remetente{ + .exp-remetente { //width: 200px; font-family: Roboto; - /* font-size: rem(13); */ + /* font-size: rem(13); */ font-weight: normal; color: #000000; float: left; /* border: 1px solid red; */ } } -.div-top-header{ +.div-top-header { width: 400px; margin: 6px auto; background-color: #0782c9; overflow: auto; } -.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: 150px; margin: 2.5px 0 2.5px 71px; float: left; } -.div-logo img{ +.div-logo img { width: 100%; } -.div-profile{ +.div-profile { font-size: rem(45); float: right; margin-right: 10px; } -.centered-div{ +.centered-div { width: 100px; height: 100px; position: absolute; @@ -233,16 +236,12 @@ margin: -35px 0 0 -35px; } - - - - -.search-input-container{ +.search-input-container { background-color: white; border-radius: 27.5px; border: solid 1px #ebebeb; font-size: rem(14); - .icon{ + .icon { color: #797979; width: 41px; height: 41px; @@ -251,17 +250,14 @@ font-size: rem(25); align-items: center; } - .input-text{ + .input-text { width: 100%; } - .icon-z{ + .icon-z { width: 20px; } } - - - .label-event-type { padding: 1px 7px; display: inline-block; diff --git a/src/assets/images/Gabinete Digital_files/vendor.js.download b/src/assets/images/Gabinete Digital_files/vendor.js.download index 1218a996a..852dcb9df 100644 --- a/src/assets/images/Gabinete Digital_files/vendor.js.download +++ b/src/assets/images/Gabinete Digital_files/vendor.js.download @@ -7137,7 +7137,7 @@ class HttpHeaders { */ clone(update) { /** @type {?} */ - const clone = new HttpHeaders(); + const clone = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; clone.lazyInit = (!!this.lazyInit && this.lazyInit instanceof HttpHeaders) ? this.lazyInit : this; clone.lazyUpdate = (this.lazyUpdate || []).concat([update]); @@ -7688,7 +7688,7 @@ class HttpRequest { } // If no headers have been passed in, construct a new HttpHeaders instance. if (!this.headers) { - this.headers = new HttpHeaders(); + this.headers = new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; } // If no parameters have been passed in, construct a new HttpUrlEncodedParams instance. if (!this.params) { @@ -7970,7 +7970,7 @@ class HttpResponseBase { constructor(init, defaultStatus = 200, defaultStatusText = 'OK') { // If the hash has values passed, use them to initialize the response. // Otherwise use the default values. - this.headers = init.headers || new HttpHeaders(); + this.headers = init.headers || new HttpHeaders({'rejectUnauthorized': environment.rejectUnauthorized });; this.status = init.status !== undefined ? init.status : defaultStatus; this.statusText = init.statusText || defaultStatusText; this.url = init.url || null; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 726ebb13e..a9256d5a8 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -4,4 +4,4 @@ import { doneITProd } from './suport/doneIt' import { DevDev } from './suport/dev' -export const environment: Environment = oaprProd; +export const environment: Environment = DevDev; diff --git a/src/environments/suport/dev.ts b/src/environments/suport/dev.ts index 1624bb161..402a1ff96 100644 --- a/src/environments/suport/dev.ts +++ b/src/environments/suport/dev.ts @@ -3,7 +3,7 @@ import { Environment } from './../../app/models/envarioment' export const DevProd: Environment = { id:'3', - apiURL: 'https://bpmdev.gdapi-dev.dyndns.info/api/', + apiURL: 'https://gdapi-dev.dyndns.info/api/', apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', apiPCURL: 'https://gdcmapi-dev.dyndns.info/api/', @@ -23,7 +23,8 @@ export const DevProd: Environment = { VP: '', dispatchPR: 'Despachos Presidênciais', sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712', - storageProduction: true + storageProduction: true, + rejectUnauthorized: "true" /* production: true, domain: 'gabinetedigital.local', defaultuser: '', @@ -66,7 +67,8 @@ export const DevDev: Environment = { VP: '', dispatchPR: 'Despachos Presidênciais', sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712', - storageProduction: false + storageProduction: false, + rejectUnauthorized: "true" /* production: true, domain: 'gabinetedigital.local', defaultuser: 'paulo.pinto@gabinetedigital.local', diff --git a/src/environments/suport/doneIt.ts b/src/environments/suport/doneIt.ts index 88bf24fe9..b8214d0d2 100644 --- a/src/environments/suport/doneIt.ts +++ b/src/environments/suport/doneIt.ts @@ -23,7 +23,8 @@ export const doneITProd: Environment = { PR: 'Titular', VP: '', dispatchPR: 'Despachos Titular', - storageProduction: true + storageProduction: true, + rejectUnauthorized: "true" }; export const doneITDev: Environment = { @@ -48,5 +49,6 @@ export const doneITDev: Environment = { PR: 'Titular', VP: '', dispatchPR: 'Despachos Titular', - storageProduction: false + storageProduction: false, + rejectUnauthorized: "true" }; \ No newline at end of file diff --git a/src/environments/suport/oapr.ts b/src/environments/suport/oapr.ts index 454770ce1..502f2cfa2 100644 --- a/src/environments/suport/oapr.ts +++ b/src/environments/suport/oapr.ts @@ -24,7 +24,8 @@ export const oaprProd: Environment = { VP: '', dispatchPR: 'Despachos Presidênciais', sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712', - storageProduction: true + storageProduction: true, + rejectUnauthorized: "false" }; export const oaprDev: Environment = { @@ -49,5 +50,6 @@ export const oaprDev: Environment = { VP: '', dispatchPR: 'Despachos Presidênciais', sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712', - storageProduction: false + storageProduction: false, + rejectUnauthorized: "false" }; \ No newline at end of file