@burh/nuxt-core 1.0.461 → 1.0.462

package/components/burh-ds/Modals/AppConfigModal.vue

@@ -97,43 +97,65 @@
 						v-for="(buttons, index) in buttons"
 						:key="index"
 					>
-						<button
-							v-if="buttons.id != 8"
-							role="button"
-							class="tag tag-outline-primary d-block w-100 buttons"
-							:value="buttons.value"
-							:class="
+						<div v-if="haveCustomTime">
+							<button
+								v-if="buttons.id != 8"
+								role="button"
+								class="tag tag-outline-primary d-block w-100 buttons"
+								:value="buttons.value"
+								:class="
+									buttons.id == currentSelectedButton
+										? 'active'
+										: ''
+								"
+								@click="timeSelection(buttons.id)"
+							>
+								<i
+									v-if="buttons.id == currentSelectedButton"
+									class="fas fa-check mr-1"
+								></i>
+								<small>{{ buttons.time }}</small>
+							</button>
+							<div :class="
 								buttons.id == currentSelectedButton
-									? 'active'
-									: ''
-							"
-							@click="timeSelection(buttons.id)"
-						>
-							<i
-								v-if="buttons.id == currentSelectedButton"
-								class="fas fa-check mr-1"
-							></i>
-							<small>{{ buttons.time }}</small>
-						</button>
-						<div :class="
-							buttons.id == currentSelectedButton
-								? 'active-time'
-								: ''" class="custom-time-div">
-							<i
-								v-if="buttons.id == currentSelectedButton"
-								class="fas fa-check mr-1 custom-time-icon"
-							></i>
-							<input
-								v-if="buttons.id == 8"
-								:placeholder="buttons.time"
-								v-model="buttons.value"
-								@change="setValueChange()"
-								@click="setInitValue(buttons.id)"
-								:class="currentSelectedButton == buttons.id ? 'active-custom': '' "
-								class="d-block w-100 buttons tag tag-outline-primary custom-time"
-								type="text"
-								v-mask="['##:##:##']"
-							/>
+									? 'active-time'
+									: ''" class="custom-time-div">
+								<i
+									v-if="buttons.id == currentSelectedButton && buttons.value"
+									class="fas fa-check mr-1"
+									:class="[currentSelectedButton == 8 ? 'custom-icon': 'custom-time-icon']"
+								></i>
+								<!-- <div v-if="buttons.id == 8" @click="setInitValue(buttons.id)">
+									<el-time-picker
+										format="HH:mm:ss"
+										value-format="HH:mm:ss"
+										v-model="buttons.value"
+										@change="setValueChange()"
+										:class="currentSelectedButton == buttons.id ? 'active-custom': 'not-active-custom' "
+										class="w-100"
+										placeholder="Outro">
+									</el-time-picker>
+								</div> -->
+							</div>
+						</div>
+						<div v-else-if="!haveCustomTime">
+							<button
+								role="button"
+								class="tag tag-outline-primary d-block w-100 buttons"
+								:value="buttons.value"
+								:class="
+									buttons.id == currentSelectedButton
+										? 'active'
+										: ''
+								"
+								@click="timeSelection(buttons.id)"
+							>
+								<i
+									v-if="buttons.id == currentSelectedButton"
+									class="fas fa-check mr-1"
+								></i>
+								<small>{{ buttons.time }}</small>
+							</button>
 						</div>
 					</div>
 				</div>
@@ -163,11 +185,12 @@
 <script>
 import { mask } from 'vue-the-mask';
 import swal from 'sweetalert2';
-import { Select, Option } from 'element-ui';
+import { Select, Option, TimePicker } from 'element-ui';
 export default {
 	components: {
 		[Select.name]: Select,
 		[Option.name]: Option,
+		[TimePicker.name]: TimePicker,
 	},
 	directives: { mask },
 	data() {
@@ -199,6 +222,14 @@ export default {
 				thirdInput: 'Insira a carga horária do curso'
 			})
 		},
+		haveCustomTime:{
+			type:Boolean,
+			default:false
+		},
+		deadLineTime:{
+			type:Number,
+			default:0
+		},
 		show: {
 			type: Boolean,
 			default: false
@@ -290,6 +321,9 @@ export default {
 		workloadValue(newValue) {
 			this.configInfo.workload = newValue;
 		},
+		deadLineTime(){
+			this.loadTime();
+		},
 		time(newValue) {
 			this.configInfo.selectedTime = newValue;
 		},
@@ -323,7 +357,7 @@ export default {
 			this.currentSelectedButton = id;
 			let getIndex = this.buttons.findIndex((e)=>e.custom == true);
 			if(!this.buttons[getIndex].value){
-				this.buttons[getIndex].value = '00:00:00';
+				this.buttons[getIndex].value = null;
 			}
 		},
 		setValueChange(){
@@ -331,7 +365,19 @@ export default {
 		},
 		loadTime() {
 			let time = null;
-			if(this.time){
+			let deadLineTime = null;
+			if(this.deadLineTime == 0){
+				deadLineTime = this.buttons.find(e => e.value == 'null');
+			}
+			if(this.deadLineTime){
+				deadLineTime = this.buttons.find(e => e.value == this.deadLineTime);
+			}
+			if(deadLineTime != null){
+				this.currentSelectedButton = deadLineTime.id;
+				this.configInfo.selectedTime = this.deadLineTime;
+				return;
+			}
+			if(this.time && this.time != 'null'){
 				time = this.buttons.find(e => e.value === this.time);
 				if(!time){
 					time = this.buttons.find(e => e.custom === true);
@@ -351,19 +397,25 @@ export default {
 		},
 		timeSelection(buttonId) {
 			let btn = this.buttons.find((e)=>e.id == buttonId);
-			this.buttons[7].value = null;
+			if(this.haveCustomTime && buttonId){
+				if(buttonId != 8 ){
+					this.buttons[7].value = null;
+				}
+			}
 			this.configInfo.selectedTime = btn.value;
 			this.currentSelectedButton = buttonId;
 		},
 		async sendConfig() {
-			let customButton = this.buttons.find((e)=>e.custom == true);
+			let customButton = this.buttons.find((e) => e.custom == true);
 			const pass = await this.$refs.appConfigModal.validate();
 			if (!pass) {
 				return;
 			}
 			let config;
-			if(this.currentSelectedButton == customButton.id){
-				let minuteReplace = customButton.value.search(60);
+			if(this.haveCustomTime && this.currentSelectedButton == customButton.id){
+				if(!customButton.value){
+					return this.showMessage('É necessário selecionar um tempo');
+				}
 				let timeReplaced = customButton.value.replaceAll(':', '');
 
 				if(timeReplaced == '000000' || timeReplaced.length < 6){
@@ -372,14 +424,6 @@ export default {
 				if(timeReplaced > 240000){
 					return this.showMessage('O tempo não pode ser maior que 24 horas');
 				}
-				if((minuteReplace && minuteReplace >= 0 && minuteReplace == 3)
-                    || customButton.value[3] + customButton.value[4] > 60 ){
-					return this.showMessage('Insira um valor entre 00 e 59 para o minuto');
-				}
-				if(minuteReplace && minuteReplace >= 0 && minuteReplace == 6
-                    || customButton.value[6] + customButton.value[7] > 60){
-					return this.showMessage('Insira um valor entre 00 e 59 para o segundo');
-				}
 			}
 			if (!this.isCourse) {
 				config = {
@@ -465,6 +509,7 @@ export default {
     font-size: 80%;
     color:#00b388;
 }
+/deep/
 .custom-time:hover::placeholder{
     color: #fff;
 }
@@ -479,10 +524,67 @@ export default {
         left:1.5rem;
         color:#fff;
     }
-    .active-custom{
-        color: #fff !important;
+    .custom-icon{
+        position:absolute;
+        top:1rem;
+        z-index: 3;
+        left:2rem;
+        color:#fff;
+    }
+}
+/deep/  .active-custom{
+    .el-time-panel{
+        width: 15.5%;
+    }
+    .el-input__inner{
+        background-color: #00b388;
+        border: 2px solid #00b388;
+        display: block;
+        height: 51.39px;
+        color:#fff;
+        text-align: center;
         &::placeholder{
-            color: #fff !important;
+            color:#fff;
+        }
+    }
+    .el-input__prefix{
+        .el-icon-time:before{
+            color:#fff;
+        }
+    }
+    .el-input__suffix{
+        .el-input__suffix-inner{
+            .el-icon-circle-close{
+                color:#fff;
+            }
+        }
+    }
+}
+/deep/ .not-active-custom{
+    .el-time-panel{
+        width: 15.5%;
+    }
+    .el-input__inner{
+        border: 2px solid #00b388;
+        display: block;
+        height: 51.39px;
+        color:#00b388;
+        text-align: center;
+        &::placeholder{
+            color:#00b388;
+        }
+    }
+    .el-input__prefix{
+        .el-icon-time:before{
+            position: relative;
+            color:#00b388;
+        }
+    }
+    .el-input__suffix{
+        .el-input__suffix-inner{
+            .el-icon-circle-close{
+                color:#00b388;
+            }
         }
     }
 }

package/components/burh-ds/Modals/InviteToRole.vue

@@ -46,14 +46,20 @@
 				</validation-provider>
 
 				<div class="select__container px-3">
-					<div name="role">
+					<validation-provider
+						tag="div"
+						name="Setor"
+						rules="required"
+						v-slot="{ errors }"
+					>
 						<label for="select" class="form-control-label">Setor</label>
 
 						<el-select
-							class="select-danger"
+							class="w-100"
 							id="select"
 							placeholder="Setor"
 							v-model="slot.role"
+							:class="{'is-invalid': errors[0]}"
 							clearable
 						>
 							<div class="text-center" slot="empty">
@@ -67,10 +73,14 @@
 								:key="role.id"
 								:label="role.level"
 								:value="role.level"
-							>
-							</el-option>
+							/>
 						</el-select>
-					</div>
+						<div
+							class="invalid-feedback"
+							style="display: block;">
+							{{ errors[0] }}
+						</div>
+					</validation-provider>
 
 					<div name="role">
 						<label for="buffer" class="form-control-label">Vincular ao buffer</label>
@@ -219,7 +229,7 @@ export default {
 			};
 		},
 		resetSlots() {
-			this.$refs.inviteUser.reset();
+			this.$refs && this.$refs.inviteUser && this.$refs.inviteUser.reset();
 			this.slots = [];
 			this.slots.push(this.getSlot());
 		}
@@ -236,6 +246,11 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.is-invalid {
+    /deep/ input {
+        border-color: #de214b!important;
+    }
+}
 .send-test-modal {
     position: fixed;
     overflow-y: scroll;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@burh/nuxt-core",
-    "version": "1.0.461",
+    "version": "1.0.462",
     "description": "Design System and Components.",
     "author": "Burh",
     "scripts": {

package/plugins/dashboard/globalComponents.js

@@ -16,7 +16,14 @@ import RouteBreadcrumb from '~/components/argon-core/Breadcrumb/RouteBreadcrumb'
 import StatsCard from '~/components/argon-core/Cards/StatsCard.vue';
 import ImageWithFallback from '@/components/burh-ds/Img/ImageWithFallback.vue';
 import { Input, Tooltip, Popover } from 'element-ui';
+
+import lang from 'element-ui/lib/locale/lang/pt-br';
+import locale from 'element-ui/lib/locale';
+
 import Vue from 'vue';
+
+locale.use(lang);
+
 /**
  * You can register global components here and use them as a plugin in your main Vue instance
  */