-
+
@@ -94,24 +94,33 @@
-->
-
+
+
+
-
diff --git a/ng-seed/src/app/appoinment/consultant-setting/extra-working-hours/extra-working-hours.component.scss b/ng-seed/src/app/appoinment/consultant-setting/extra-working-hours/extra-working-hours.component.scss
index 405800a..3f5ebb9 100644
--- a/ng-seed/src/app/appoinment/consultant-setting/extra-working-hours/extra-working-hours.component.scss
+++ b/ng-seed/src/app/appoinment/consultant-setting/extra-working-hours/extra-working-hours.component.scss
@@ -21,6 +21,7 @@
.label-container{
margin-right: 8rem;
margin-left: 1.5rem;
+ color: #666;
}
// .outline{
// width: 18%;
@@ -28,6 +29,12 @@
.mate{
width: 16% !important;
}
+ .mates{
+ width: 16% !important;
+ ::ng-deep .mat-form-field-outline {
+ width: 115%!important;
+ }
+ }
.date-marge{
margin-left: 4.5rem;
}
@@ -38,10 +45,12 @@
.mr-8{
margin-right: 7rem;
margin-left: 1.5rem;
+ color: #666;
}
.mr2{
margin-right: 3rem;
margin-left: 1.5rem;
+ color: #666;
}
.cancel {
background: #F5F5F5;
@@ -100,8 +109,8 @@
}
::ng-deep .mat-icon-button {
margin-right: -3rem;
- margin-top: -12px;
- padding-top: 10px;
+ // margin-top: -12px;
+ // padding-top: 10px;
}
::ng-deep .mat-slide-toggle-bar {
width: 50px;
@@ -116,6 +125,7 @@
.container-to{
margin-right: 9rem;
margin-left: 1.5rem;
+ color: #666;
}
::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix {
padding: 0em 0 1em 0;
@@ -146,115 +156,199 @@
margin-left: 6rem;
}
.time-align{
- padding-top: 10px!important;
+ padding-top: 10px !important;
+ font-size: 20px;
+ padding-left: 10px;
}
//switch
-.switch {
- position: relative;
- display: block;
- // vertical-align: top;
- width: 100px;
- height: 30px;
- padding: 3px;
- margin: 0 10px 10px 0;
- // background: linear-gradient(to bottom, #eeeeee, #FFFFFF 25px);
- // background-image: -webkit-linear-gradient(top, #eeeeee, #FFFFFF 25px);
- border-radius: 18px;
- // box-shadow: inset 0 -1px white, inset 0 1px 1px rgba(0, 0, 0, 0.05);
- cursor: pointer;
- box-sizing:content-box;
-}
-.switch-input {
- position: absolute;
- top: 0;
- left: 0;
- opacity: 0;
- box-sizing:content-box;
-}
-.switch-label {
- position: relative;
- display: block;
- height: inherit;
- font-size: 10px;
- text-transform: uppercase;
- // background: #eceeef;
- border-radius: inherit;
- // box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.12), inset 0 0 2px rgba(0, 0, 0, 0.15);
- border: 1px solid #4CAE4C;
- box-sizing:content-box;
-}
-.switch-label:before, .switch-label:after {
- position: absolute;
- top: 50%;
- margin-top: -.5em;
- line-height: 1;
- -webkit-transition: inherit;
- -moz-transition: inherit;
- -o-transition: inherit;
- transition: inherit;
- box-sizing:content-box;
-}
-.switch-label:before {
- // content: attr(data-off);
- content: 'enable';
- right: 11px;
- color: #111111;
- // text-shadow: 0 1px rgba(255, 255, 255, 0.5);
-}
-.switch-label:after {
- // content: attr(data-on);
- content: 'disable ';
- left: 11px;
- color: #111111;
- // text-shadow: 0 1px rgba(0, 0, 0, 0.2);
- opacity: 0;
-}
-.switch-input:checked ~ .switch-label {
- background: #FFFFFF;
- // box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15), inset 0 0 3px rgba(0, 0, 0, 0.2);
-}
-.switch-input:checked ~ .switch-label:before {
- opacity: 0;
-}
-.switch-input:checked ~ .switch-label:after {
- opacity: 1;
-}
-.switch-handle {
- position: absolute;
- top: 4px;
- left: 4px;
- width: 28px;
- height: 28px;
- // background: linear-gradient(to bottom, #FFFFFF 40%, #f0f0f0);
- background-image: -webkit-linear-gradient(top, #FFFFFF 40%, #f0f0f0);
- border-radius: 100%;
- box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
-}
-.switch-handle:before {
- content: "";
- position: absolute;
- top: 50%;
- left: 50%;
- margin: -6px 0 0 -6px;
- width: 12px;
- height: 12px;
- // background: linear-gradient(to bottom, #eeeeee, #FFFFFF);
- background-image: -webkit-linear-gradient(top, #eeeeee, #FFFFFF);
- border-radius: 6px;
- box-shadow: inset 0 1px rgba(0, 0, 0, 0.02);
-}
-.switch-input:checked ~ .switch-handle {
- left: 74px;
- box-shadow: -1px 1px 5px rgba(0, 0, 0, 0.2);
-}
+// .switch {
+// position: relative;
+// display: block;
+// // vertical-align: top;
+// width: 100px;
+// height: 30px;
+// padding: 3px;
+// margin: 0 10px 10px 0;
+// // background: linear-gradient(to bottom, #eeeeee, #FFFFFF 25px);
+// // background-image: -webkit-linear-gradient(top, #eeeeee, #FFFFFF 25px);
+// border-radius: 18px;
+// // box-shadow: inset 0 -1px white, inset 0 1px 1px rgba(0, 0, 0, 0.05);
+// cursor: pointer;
+// box-sizing:content-box;
+// }
+// .switch-input {
+// position: absolute;
+// top: 0;
+// left: 0;
+// opacity: 0;
+// box-sizing:content-box;
+// }
+// .switch-label {
+// position: relative;
+// display: block;
+// height: inherit;
+// font-size: 10px;
+// text-transform: uppercase;
+// // background: #eceeef;
+// border-radius: inherit;
+// // box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.12), inset 0 0 2px rgba(0, 0, 0, 0.15);
+// border: 1px solid #4CAE4C;
+// box-sizing:content-box;
+// }
+// .switch-label:before, .switch-label:after {
+// position: absolute;
+// top: 50%;
+// margin-top: -.5em;
+// line-height: 1;
+// -webkit-transition: inherit;
+// -moz-transition: inherit;
+// -o-transition: inherit;
+// transition: inherit;
+// box-sizing:content-box;
+// }
+// .switch-label:before {
+// // content: attr(data-off);
+// content: 'enable';
+// right: 11px;
+// color: #111111;
+// // text-shadow: 0 1px rgba(255, 255, 255, 0.5);
+// }
+// .switch-label:after {
+// // content: attr(data-on);
+// content: 'disable ';
+// left: 11px;
+// color: #111111;
+// // text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+// opacity: 0;
+// }
+// .switch-input:checked ~ .switch-label {
+// background: #FFFFFF;
+// // box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15), inset 0 0 3px rgba(0, 0, 0, 0.2);
+// }
+// .switch-input:checked ~ .switch-label:before {
+// opacity: 0;
+// }
+// .switch-input:checked ~ .switch-label:after {
+// opacity: 1;
+// }
+// .switch-handle {
+// position: absolute;
+// top: 4px;
+// left: 4px;
+// width: 28px;
+// height: 28px;
+// // background: linear-gradient(to bottom, #FFFFFF 40%, #f0f0f0);
+// background-image: -webkit-linear-gradient(top, #FFFFFF 40%, #f0f0f0);
+// border-radius: 100%;
+// box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+// }
+// .switch-handle:before {
+// content: "";
+// position: absolute;
+// top: 50%;
+// left: 50%;
+// margin: -6px 0 0 -6px;
+// width: 12px;
+// height: 12px;
+// // background: linear-gradient(to bottom, #eeeeee, #FFFFFF);
+// background-image: -webkit-linear-gradient(top, #eeeeee, #FFFFFF);
+// border-radius: 6px;
+// box-shadow: inset 0 1px rgba(0, 0, 0, 0.02);
+// }
+// .switch-input:checked ~ .switch-handle {
+// left: 74px;
+// box-shadow: -1px 1px 5px rgba(0, 0, 0, 0.2);
+// }
-/* Transition
-========================== */
-.switch-label, .switch-handle {
- transition: All 0.3s ease;
- -webkit-transition: All 0.3s ease;
- -moz-transition: All 0.3s ease;
- -o-transition: All 0.3s ease;
+// /* Transition
+// ========================== */
+// .switch-label, .switch-handle {
+// transition: All 0.3s ease;
+// -webkit-transition: All 0.3s ease;
+// -moz-transition: All 0.3s ease;
+// -o-transition: All 0.3s ease;
+// }
+
+.onoffswitch {
+ position: relative;
+ width: 135px;
+ // -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none;
+}
+.onoffswitch-checkbox {
+ display: none;
+}
+.onoffswitch-label {
+ display: block;
+ overflow: hidden;
+ cursor: pointer;
+ // border: 2px solid #4CAE4C;
+ border-radius: 20px;
+ // box-shadow: 0 12px 16px 0 rgba(0,0,0,0.24),0 17px 50px 0 rgba(0,0,0,0.19);
+}
+.onoffswitch-inner {
+ display: block;
+ width: 200%;
+ margin-left: -100%;
+ // transition: margin 0.3s ease-in 0s;
+
+}
+.onoffswitch-inner:before, .onoffswitch-inner:after {
+ display: block;
+ float: left;
+ width: 50%;
+ height: 30px;
+ padding: 0;
+ line-height: 30px;
+ font-size: 12px;
+ color: white;
+ box-sizing: border-box;
+}
+.onoffswitch-inner:before {
+ content: " Enable";
+ padding-left: 10px;
+ background-color: #FFFFFF; color: #4C4C4C;
+ border: 1px solid #4CAE4C;
+ border-radius: 50px;
+ box-shadow: 0 12px 16px 0 rgba(0,0,0,0.24),0 17px 50px 0 rgba(0,0,0,0.19);
+ // box-shadow: 0 0 10px rgb(82 81 144 / 38%);
+}
+.onoffswitch-inner:after {
+ content: "Disable";
+ padding-right: 10px;
+ background-color: #FFFFFF; color: #4C4C4C;;
+ text-align: right;
+ border: 1px solid #999999;
+ // border: 1px solid #DDD;
+ border-radius: 50px;
+ box-shadow: 0 12px 16px 0 rgba(0,0,0,0.24),0 17px 50px 0 rgba(0,0,0,0.19);
+ // box-shadow: 0 0 10px rgb(82 81 144 / 38%);
+}
+
+.onoffswitch-switch {
+ display: block;
+ width: 25px;
+ margin: 2px;
+ background: #999999;
+ position: absolute; top: 0; bottom: 0;
+ right: 105px;
+ // border: 1px solid #999999;
+ border-radius: 20px;
+ transition: all 0.3s ease-in 0s;
+}
+
+// .onoffswitch-switch:after {
+// display: block;
+// background: #999999!important;
+// }
+.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-inner {
+ margin-left: 0;
+ // border: 1px solid #999999;
+}
+.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-switch {
+ right: 0px;
+ background: #4CAE4C;
+ // border: 1px solid #999999;
+
}
\ No newline at end of file
diff --git a/ng-seed/src/app/appoinment/consultant-setting/unavailability/unavailability.component.html b/ng-seed/src/app/appoinment/consultant-setting/unavailability/unavailability.component.html
index 55e4afb..e236936 100644
--- a/ng-seed/src/app/appoinment/consultant-setting/unavailability/unavailability.component.html
+++ b/ng-seed/src/app/appoinment/consultant-setting/unavailability/unavailability.component.html
@@ -26,21 +26,28 @@
-
diff --git a/ng-seed/src/app/appoinment/consultant-setting/unavailability/unavailability.component.scss b/ng-seed/src/app/appoinment/consultant-setting/unavailability/unavailability.component.scss
index 220a37d..6c296dc 100644
--- a/ng-seed/src/app/appoinment/consultant-setting/unavailability/unavailability.component.scss
+++ b/ng-seed/src/app/appoinment/consultant-setting/unavailability/unavailability.component.scss
@@ -21,6 +21,7 @@
.label-container{
margin-right: 8rem;
margin-left: 1.5rem;
+ color: #666;
}
// .outline{
// width: 18%;
@@ -28,6 +29,12 @@
.mate{
width: 16% !important;
}
+ .mates{
+ width: 16% !important;
+ ::ng-deep .mat-form-field-outline {
+ width: 115%!important;
+ }
+ }
.date-marge{
margin-left: 4.5rem;
}
@@ -38,10 +45,12 @@
.mr-8{
margin-right: 7rem;
margin-left: 1.5rem;
+ color: #666;
}
.mr2{
margin-right: 3rem;
margin-left: 1.5rem;
+ color: #666;
}
.cancel {
background: #F5F5F5;
@@ -100,23 +109,23 @@
}
::ng-deep .mat-icon-button {
margin-right: -3rem;
- margin-top: -12px;
- padding-top: 10px;
+ // margin-top: -12px;
+ // padding-top: 10px;
+}
+::ng-deep .mat-slide-toggle-bar {
+ width: 50px;
+ height: 20px;
}
-// ::ng-deep .mat-slide-toggle-bar {
-// border-radius: 20px!important ;
-// width: 80px!important;
-// height: 35px!important;
-// }
-
.form-control{
padding: 10px;
border-radius: 5px;
+ // border: 1px solid #666;
border: 1px solid rgba(0, 0, 0, 0.12);
}
.container-to{
margin-right: 9rem;
margin-left: 1.5rem;
+ color: #666;
}
::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix {
padding: 0em 0 1em 0;
@@ -125,7 +134,7 @@
display: flex;
}
.popup-button{
- margin-top: 3rem;
+ margin-top: 7rem;
}
.example-h2 {
margin: 10px;
@@ -142,120 +151,199 @@
.example-margin {
margin: 0 10px!important;
margin-left: 25px!important;
+ color: #666;
}
.mat-radio{
margin-left: 6rem;
}
.time-align{
- padding-top: 10px!important;
+ padding-top: 10px !important;
+ font-size: 20px;
+ padding-left: 10px;
}
//switch
-.switch {
- position: relative;
- display: block;
- // vertical-align: top;
- width: 100px;
- height: 30px;
- padding: 3px;
- margin: 0 10px 10px 0;
- // background: linear-gradient(to bottom, #eeeeee, #FFFFFF 25px);
- // background-image: -webkit-linear-gradient(top, #eeeeee, #FFFFFF 25px);
- border-radius: 18px;
- // box-shadow: inset 0 -1px white, inset 0 1px 1px rgba(0, 0, 0, 0.05);
- cursor: pointer;
- box-sizing:content-box;
-}
-.switch-input {
- position: absolute;
- top: 0;
- left: 0;
- opacity: 0;
- box-sizing:content-box;
-}
-.switch-label {
- position: relative;
- display: block;
- height: inherit;
- font-size: 10px;
- text-transform: uppercase;
- // background: #eceeef;
- border-radius: inherit;
- // box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.12), inset 0 0 2px rgba(0, 0, 0, 0.15);
- border: 1px solid #4CAE4C;
- box-sizing:content-box;
-}
-.switch-label:before, .switch-label:after {
- position: absolute;
- top: 50%;
- margin-top: -.5em;
- line-height: 1;
- -webkit-transition: inherit;
- -moz-transition: inherit;
- -o-transition: inherit;
- transition: inherit;
- box-sizing:content-box;
-}
-.switch-label:before {
- // content: attr(data-off);
- content: 'enable';
- right: 11px;
- color: #111111;
- // text-shadow: 0 1px rgba(255, 255, 255, 0.5);
-}
-.switch-label:after {
- // content: attr(data-on);
- content: 'disable ';
- left: 11px;
- color: #111111;
- // text-shadow: 0 1px rgba(0, 0, 0, 0.2);
- opacity: 0;
-}
-.switch-input:checked ~ .switch-label {
- background: #FFFFFF;
- // box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15), inset 0 0 3px rgba(0, 0, 0, 0.2);
-}
-.switch-input:checked ~ .switch-label:before {
- opacity: 0;
-}
-.switch-input:checked ~ .switch-label:after {
- opacity: 1;
-}
-.switch-handle {
- position: absolute;
- top: 4px;
- left: 4px;
- width: 28px;
- height: 28px;
- // background: linear-gradient(to bottom, #FFFFFF 40%, #f0f0f0);
- background-image: -webkit-linear-gradient(top, #FFFFFF 40%, #f0f0f0);
- border-radius: 100%;
- box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
-}
-.switch-handle:before {
- content: "";
- position: absolute;
- top: 50%;
- left: 50%;
- margin: -6px 0 0 -6px;
- width: 12px;
- height: 12px;
- // background: linear-gradient(to bottom, #eeeeee, #FFFFFF);
- background-image: -webkit-linear-gradient(top, #eeeeee, #FFFFFF);
- border-radius: 6px;
- box-shadow: inset 0 1px rgba(0, 0, 0, 0.02);
-}
-.switch-input:checked ~ .switch-handle {
- left: 74px;
- box-shadow: -1px 1px 5px rgba(0, 0, 0, 0.2);
-}
+// .switch {
+// position: relative;
+// display: block;
+// // vertical-align: top;
+// width: 100px;
+// height: 30px;
+// padding: 3px;
+// margin: 0 10px 10px 0;
+// // background: linear-gradient(to bottom, #eeeeee, #FFFFFF 25px);
+// // background-image: -webkit-linear-gradient(top, #eeeeee, #FFFFFF 25px);
+// border-radius: 18px;
+// // box-shadow: inset 0 -1px white, inset 0 1px 1px rgba(0, 0, 0, 0.05);
+// cursor: pointer;
+// box-sizing:content-box;
+// }
+// .switch-input {
+// position: absolute;
+// top: 0;
+// left: 0;
+// opacity: 0;
+// box-sizing:content-box;
+// }
+// .switch-label {
+// position: relative;
+// display: block;
+// height: inherit;
+// font-size: 10px;
+// text-transform: uppercase;
+// // background: #eceeef;
+// border-radius: inherit;
+// // box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.12), inset 0 0 2px rgba(0, 0, 0, 0.15);
+// border: 1px solid #4CAE4C;
+// box-sizing:content-box;
+// }
+// .switch-label:before, .switch-label:after {
+// position: absolute;
+// top: 50%;
+// margin-top: -.5em;
+// line-height: 1;
+// -webkit-transition: inherit;
+// -moz-transition: inherit;
+// -o-transition: inherit;
+// transition: inherit;
+// box-sizing:content-box;
+// }
+// .switch-label:before {
+// // content: attr(data-off);
+// content: 'enable';
+// right: 11px;
+// color: #111111;
+// // text-shadow: 0 1px rgba(255, 255, 255, 0.5);
+// }
+// .switch-label:after {
+// // content: attr(data-on);
+// content: 'disable ';
+// left: 11px;
+// color: #111111;
+// // text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+// opacity: 0;
+// }
+// .switch-input:checked ~ .switch-label {
+// background: #FFFFFF;
+// // box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15), inset 0 0 3px rgba(0, 0, 0, 0.2);
+// }
+// .switch-input:checked ~ .switch-label:before {
+// opacity: 0;
+// }
+// .switch-input:checked ~ .switch-label:after {
+// opacity: 1;
+// }
+// .switch-handle {
+// position: absolute;
+// top: 4px;
+// left: 4px;
+// width: 28px;
+// height: 28px;
+// // background: linear-gradient(to bottom, #FFFFFF 40%, #f0f0f0);
+// background-image: -webkit-linear-gradient(top, #FFFFFF 40%, #f0f0f0);
+// border-radius: 100%;
+// box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+// }
+// .switch-handle:before {
+// content: "";
+// position: absolute;
+// top: 50%;
+// left: 50%;
+// margin: -6px 0 0 -6px;
+// width: 12px;
+// height: 12px;
+// // background: linear-gradient(to bottom, #eeeeee, #FFFFFF);
+// background-image: -webkit-linear-gradient(top, #eeeeee, #FFFFFF);
+// border-radius: 6px;
+// box-shadow: inset 0 1px rgba(0, 0, 0, 0.02);
+// }
+// .switch-input:checked ~ .switch-handle {
+// left: 74px;
+// box-shadow: -1px 1px 5px rgba(0, 0, 0, 0.2);
+// }
-/* Transition
-========================== */
-.switch-label, .switch-handle {
- transition: All 0.3s ease;
- -webkit-transition: All 0.3s ease;
- -moz-transition: All 0.3s ease;
- -o-transition: All 0.3s ease;
+// /* Transition
+// ========================== */
+// .switch-label, .switch-handle {
+// transition: All 0.3s ease;
+// -webkit-transition: All 0.3s ease;
+// -moz-transition: All 0.3s ease;
+// -o-transition: All 0.3s ease;
+// }
+
+.onoffswitch {
+ position: relative;
+ width: 135px;
+ // -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none;
+}
+.onoffswitch-checkbox {
+ display: none;
+}
+.onoffswitch-label {
+ display: block;
+ overflow: hidden;
+ cursor: pointer;
+ // border: 2px solid #4CAE4C;
+ border-radius: 20px;
+}
+.onoffswitch-inner {
+ display: block;
+ width: 200%;
+ margin-left: -100%;
+ // transition: margin 0.3s ease-in 0s;
+
+}
+.onoffswitch-inner:before, .onoffswitch-inner:after {
+ display: block;
+ float: left;
+ width: 50%;
+ height: 30px;
+ padding: 0;
+ line-height: 30px;
+ font-size: 12px;
+ color: white;
+ box-sizing: border-box;
+}
+.onoffswitch-inner:before {
+ content: " Enable";
+ padding-left: 10px;
+ background-color: #FFFFFF; color: #4C4C4C;
+ border: 1px solid #4CAE4C;
+ border-radius: 50px;
+}
+.onoffswitch-inner:after {
+ content: "Disable";
+ padding-right: 10px;
+ background-color: #FFFFFF; color: #4C4C4C;;
+ text-align: right;
+ border: 1px solid #999999;
+ border-radius: 50px;
+}
+
+.onoffswitch-switch {
+ display: block;
+ width: 25px;
+ margin: 2px;
+ background: #999999;
+ position: absolute; top: 0; bottom: 0;
+ right: 105px;
+ // border: 1px solid #999999;
+ border-radius: 20px;
+ transition: all 0.3s ease-in 0s;
+}
+
+// .onoffswitch-switch:after {
+// display: block;
+// background: #999999!important;
+// }
+.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-inner {
+ margin-left: 0;
+ // border: 1px solid #999999;
+}
+.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-switch {
+ right: 0px;
+ background: #4CAE4C;
+ // border: 1px solid #999999;
+
}
\ No newline at end of file
diff --git a/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.ts b/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.ts
index 7c856ba..80b4331 100644
--- a/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.ts
+++ b/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.ts
@@ -80,11 +80,14 @@ export class CustomersListComponent implements OnInit {
getCustomersList() {
console.log('in')
//this._pd.getTabStatusPdDetails(this.tabStatus)
+ this.recordStatus=false;
let user_role = localStorage.getItem('user_role');
- if(user_role == 'PRACTITIONER'){
- this._app.getAppoinmentsListDetails().subscribe(res => {
+ if(user_role == 'PRACTITIONER' || user_role == 'BADMIN'){
+ let param ={"busId": localStorage.getItem('busId')}
+ this._app.getAppoinmentsListDetails(param).subscribe(res => {
if (res.status == 200) {
this.appoinmentsList = res.data;
+ this.recordStatus=true;
let id = localStorage.getItem('user_id')
console.log(id)
console.log(this.appoinmentsList)
@@ -94,14 +97,21 @@ export class CustomersListComponent implements OnInit {
filter.forEach(element => {
this.appoinmentsIds.push( element.customer[0].id)
});
- this.getCustomerDetails()
- }
+ if(this.appoinmentsList.length>0){
+ this.getCustomerDetails()
+ }
+
+ } else{
+ this.isLoading = false
+ this.recordStatus=true;
+ }
})
}
// this.getCustomerDetails()
}
getCustomerDetails(){
+
this._cus.getCustomersListDetails().subscribe(res => {
if (res.status == 200) {
this.isLoading = false
@@ -135,6 +145,7 @@ export class CustomersListComponent implements OnInit {
}
else{
+ this.isLoading = false
this.customersList=[];
this.customersListLength= null;
this.recordStatus=true;
diff --git a/ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.html b/ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.html
index 55ab0c9..70d4502 100644
--- a/ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.html
+++ b/ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.html
@@ -23,6 +23,11 @@
Duration is required
+
+
+ Fees is required
+
+
Sure to delete {{local_data.servicesName}}?
diff --git a/ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.ts b/ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.ts
index ee350de..6fc765b 100644
--- a/ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.ts
+++ b/ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.ts
@@ -40,7 +40,8 @@ ngOnInit() {
this.form = new FormGroup({
servicesName: new FormControl('', [Validators.required, Validators.maxLength(20)]),
duration: new FormControl('',[Validators.required]),
- description: new FormControl('',[Validators.required])
+ description: new FormControl('',[Validators.required]),
+ fees:new FormControl('',[Validators.required])
});
this.form.patchValue(this.local_data)
}
diff --git a/ng-seed/src/app/appoinment/service-list-details/service-api-services/api-service.service.ts b/ng-seed/src/app/appoinment/service-list-details/service-api-services/api-service.service.ts
index 2f27a68..6c956bc 100644
--- a/ng-seed/src/app/appoinment/service-list-details/service-api-services/api-service.service.ts
+++ b/ng-seed/src/app/appoinment/service-list-details/service-api-services/api-service.service.ts
@@ -12,14 +12,20 @@ export class ApiServiceService {
private apiUrl = environment.apiEndpoint;
constructor(private _http: HttpClient) { }
- getServicesListDetails(): Observable
{
+ getServicesListDetails(param): Observable {
+ console.log('IN')
+ return this._http.post(this.apiUrl + "getServicesDetails",param)
+ // .pipe(
+ // catchError(this.handleError('role', []))
+ // )
+ }
+ getServicesListDetails2(): Observable {
console.log('IN')
return this._http.post(this.apiUrl + "getServicesDetails",{})
// .pipe(
// catchError(this.handleError('role', []))
// )
}
-
addFormDetails(addParams): Observable {
return this._http.post(this.apiUrl + 'CreateService', addParams)
// .pipe(
diff --git a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.html b/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.html
index 9d95509..dcb60be 100644
--- a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.html
+++ b/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.html
@@ -34,12 +34,16 @@
Duration
{{row.duration}}
-
+
+ Fees
+ {{row.fees}}
+
Description
{{row.description}}
+
diff --git a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts b/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts
index c585533..4ad9104 100644
--- a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts
+++ b/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts
@@ -18,7 +18,7 @@ export class ServiceListComponent implements OnInit {
addFormData: any;
push: any;
id: number;
- displayedColumns: string[] = ['serviceId','servicesName','duration','description','action'];
+ displayedColumns: string[] = ['serviceId','servicesName','duration','fees','description','action'];
serviceId: number;
public servicesListLength: number;
@@ -59,7 +59,9 @@ export class ServiceListComponent implements OnInit {
getServicesList() {
- this._api.getServicesListDetails().subscribe(res => {
+ let param ={"busId": localStorage.getItem('busId')}
+ console.log(param)
+ this._api.getServicesListDetails(param).subscribe(res => {
if (res.status == 200) {
this.isLoading = false;
this.servicesList = res.data;
@@ -74,6 +76,7 @@ export class ServiceListComponent implements OnInit {
this.recordStatus=false;
}
else{
+ this.isLoading = false;
this.servicesList=[];
this.servicesListLength= null;
this.recordStatus=true;
@@ -137,10 +140,11 @@ export class ServiceListComponent implements OnInit {
if(result.event == 'Add'){
console.log('add')
let addFormData = {
- // busId: 'abc123',
- // id: row_obj.id,
+ busId: localStorage.getItem('busId'),
+ id: row_obj.id,
description:row_obj.description,
duration: parseInt(row_obj.duration),
+ fees: parseInt(row_obj.fees),
serviceId: row_obj.serviceId,
servicesName: row_obj.servicesName
};
@@ -151,6 +155,7 @@ export class ServiceListComponent implements OnInit {
let updatevalue = {
description:row_obj.description,
serviceId: row_obj.serviceId,
+ fees: parseInt(row_obj.fees),
duration: parseInt(row_obj.duration),
servicesName: row_obj.servicesName
}
diff --git a/ng-seed/src/app/appoinment/user/add-user/add-user.component.html b/ng-seed/src/app/appoinment/user/add-user/add-user.component.html
index 88b6e17..5145396 100644
--- a/ng-seed/src/app/appoinment/user/add-user/add-user.component.html
+++ b/ng-seed/src/app/appoinment/user/add-user/add-user.component.html
@@ -14,7 +14,7 @@
-->
Business
-
+
--
{{business.busName}}
@@ -58,12 +58,24 @@
Contact No must be at least 10 characters
Limit exceed
-
+
+
+
+ Password
+
+
+ Password length must be greater than or equal to 8 and password must contain one or more uppercase ,
+ lowercase , numeric and special characters
+
+
+ Password is required
+
+
![]()
![]()
diff --git a/ng-seed/src/app/appoinment/user/add-user/add-user.component.scss b/ng-seed/src/app/appoinment/user/add-user/add-user.component.scss
index 8da8901..2cd81c4 100644
--- a/ng-seed/src/app/appoinment/user/add-user/add-user.component.scss
+++ b/ng-seed/src/app/appoinment/user/add-user/add-user.component.scss
@@ -59,4 +59,12 @@ input[type=file]::file-selector-button {
.imgSizeValidation{
color: red;
font-family: ui-serif;
+ }
+ .user-mate{
+ ::ng-deep .mat-form-field-subscript-wrapper {
+ position: inherit!important;
+ box-sizing: border-box;
+ width: 100%;
+ overflow: hidden;
+ }
}
\ No newline at end of file
diff --git a/ng-seed/src/app/appoinment/user/add-user/add-user.component.ts b/ng-seed/src/app/appoinment/user/add-user/add-user.component.ts
index 56120e0..27e4ceb 100644
--- a/ng-seed/src/app/appoinment/user/add-user/add-user.component.ts
+++ b/ng-seed/src/app/appoinment/user/add-user/add-user.component.ts
@@ -31,6 +31,7 @@ export class AddUserComponent implements OnInit {
formData:any=[];
private apiUrl = environment.apiEndpoint;
busId: any;
+ disableBus: any=1;
constructor(private notifierService: NotifierService,private router: Router,private formBuilder: FormBuilder,
public dialogRef: MatDialogRef,
@Optional() @Inject(MAT_DIALOG_DATA) public data: UsersData,public _bus:BusinessService) {
@@ -45,6 +46,7 @@ export class AddUserComponent implements OnInit {
ngOnInit() {
+ this.disableBus = localStorage.getItem('go_admin')
let userrole = localStorage.getItem('user_role')
this.form = new FormGroup({
businessselect: new FormControl('',[Validators.required]),
@@ -56,7 +58,10 @@ export class AddUserComponent implements OnInit {
email: new FormControl('', [Validators.required, Validators.email,Validators.pattern(
'[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+.[a-zA-Z]{2,63}$',
),]),
- password: new FormControl('', [Validators.required, Validators.minLength(6)]),
+ // password: new FormControl('', [Validators.required, Validators.minLength(6)]),
+ password: new FormControl('', [Validators.required,Validators.pattern(
+ '^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*_=+-]).{8,12}$'
+ )]),
logo: new FormControl('', null),
// confirmPassword: new FormControl('', [Validators.required, Validators.minLength(6)]),
createdBy:new FormControl(userrole,null),
@@ -107,10 +112,10 @@ export class AddUserComponent implements OnInit {
console.log(this.form['value'].businessselect)
// this.local_data.businessselect = this.local_data.busId
console.log(localStorage.getItem('busNameID'), localStorage.getItem('go_admin'))
- if( localStorage.getItem('go_admin') =='0'){
+ // if( localStorage.getItem('go_admin') =='0'){
this.local_data.businessselect = localStorage.getItem('busNameID')
this.form.controls['businessselect'].setValue(localStorage.getItem('busNameID'))
- }
+ // }
//localStorage.setItem('busNameID',getData.busId)
if(this.action == 'Update'){
@@ -154,7 +159,7 @@ export class AddUserComponent implements OnInit {
}
if(this.action == 'Update'){
this.formData.append('id', tmp.id);
- this.formData.append('busId', this.busId);
+
}
this.formData.append('busId', this.busId);
this.formData.append('userName', tmp.userName);
diff --git a/ng-seed/src/app/appoinment/user/user-list/user-list.component.html b/ng-seed/src/app/appoinment/user/user-list/user-list.component.html
index f74ed2a..f61abb0 100644
--- a/ng-seed/src/app/appoinment/user/user-list/user-list.component.html
+++ b/ng-seed/src/app/appoinment/user/user-list/user-list.component.html
@@ -4,7 +4,7 @@
Filter
-
+
Role
- All
- SADMIN
- PRACTITIONER
- BADMIN
+ All
+ SADMIN
+ PRACTITIONER
+ BADMIN
diff --git a/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts b/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts
index 62ccc29..63c227c 100644
--- a/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts
+++ b/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts
@@ -169,7 +169,8 @@ export class UserListComponent implements OnInit {
}
openDialog(action,obj) {
- // localStorage.setItem('busNameID',null)
+ localStorage.setItem('busNameID',obj.busId
+ )
obj.action = action;
const dialogRef = this.dialog.open(AddUserComponent, {
// width: '30%',
@@ -179,6 +180,8 @@ export class UserListComponent implements OnInit {
data:obj
});
dialogRef.afterClosed().subscribe(result => {
+ localStorage.setItem('go_admin','1')
+ localStorage.setItem('busNameID',null)
if(result != undefined){
console.log(result)
this.formAddUpdateAndDelete(result,result.data)
diff --git a/ng-seed/src/app/end-user/search-category/search-category.component.ts b/ng-seed/src/app/end-user/search-category/search-category.component.ts
index 44ded6e..5221884 100644
--- a/ng-seed/src/app/end-user/search-category/search-category.component.ts
+++ b/ng-seed/src/app/end-user/search-category/search-category.component.ts
@@ -110,7 +110,7 @@ export class SearchCategoryComponent implements OnInit {
console.log(this.eventData)
if(this.eventData == 'services'){
//this._pd.getTabStatusPdDetails(this.tabStatus)
- this._api.getServicesListDetails().subscribe(res => {
+ this._api.getServicesListDetails2().subscribe(res => {
if (res.status == 200) {
this.servicesList = res.data;
}
diff --git a/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.html b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.html
index 77ea590..0f8e68f 100644
--- a/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.html
+++ b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.html
@@ -75,7 +75,7 @@
Date:{{date | date:'longDate'}}
Time :{{slotTime | date:'shortTime'}}
- -->
+ -->
Date :
{{date | date:'longDate'}}
Time :
@@ -102,10 +102,6 @@
-
-
-
-
diff --git a/ng-seed/src/app/layouts/role-menu-items.pipe.ts b/ng-seed/src/app/layouts/role-menu-items.pipe.ts
index 90281c2..0bad9ad 100644
--- a/ng-seed/src/app/layouts/role-menu-items.pipe.ts
+++ b/ng-seed/src/app/layouts/role-menu-items.pipe.ts
@@ -11,7 +11,7 @@ export class RoleMenuItemsPipe implements PipeTransform {
// if(type=="1"){
switch(localStorage.getItem('user_role')){
case 'SADMIN': return value.filter(val=>val.state!="appoinments" && val.state!="customers" && val.state != "consultant-setting" && val.state!="consultants" && val.state!="services");
- case 'BADMIN': return value.filter(val=>val.state !="business" && val.state != "consultant-setting" && val.state!="users" && val.state!="consultants");
+ case 'BADMIN': return value.filter(val=>val.state !="business" && val.state!="users" && val.state!="consultants");
case 'PRACTITIONER': return value.filter(val=>val.state !="business" && val.state!="consultants" && val.state!="users" && val.state!="services");
// case 'PRACTITIONER':
// case '3': return value.filter(val=>val.state!="settings");
diff --git a/ng-seed/src/app/session/login/login.component.ts b/ng-seed/src/app/session/login/login.component.ts
index e66a289..a002a46 100644
--- a/ng-seed/src/app/session/login/login.component.ts
+++ b/ng-seed/src/app/session/login/login.component.ts
@@ -47,7 +47,11 @@ export class LoginComponent {
localStorage.setItem('user_token',res.token);
localStorage.setItem('user_role',res.role);
localStorage.setItem('email',JSON.stringify(auth))
- localStorage.setItem('user_id',res.roleId)
+ localStorage.setItem('user_id',res.roleId
+ );
+
+ localStorage.setItem('busId',res.busId)
+
this.router.navigate(['/home'])
}
}else{