diff --git a/ng6-seed/src/app/dashboard/dashboard.component.html b/ng6-seed/src/app/dashboard/dashboard.component.html index 276146a03..4f840d978 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.html +++ b/ng6-seed/src/app/dashboard/dashboard.component.html @@ -1,96 +1,167 @@
- +
- - Today's Status - -
- + + + + {{dashboardTitle}} + + +
+
Full - {{total1}}
+ + + +
+
+
Smart - {{total2}}
+ +
+ +
+
Tele - {{total3}}
+ +
+ + +
+ -
-
- - Today's Details - - -
- Full - - -
- -
- Smart - + Full +
+
- Tele - + Smart +
- - -
- -
-
- - Alert warning - - - - - -

{{item.applicantname}}

-

{{item.applicantid}}

-

{{item.lendername}} - {{item.status}}

- - - - - -
- -
- - Lenderwise - - - - - -

{{item.lendername}} / {{item.billingaddr}}

-

Full -{{item.fullpd}} / Smart -{{item.smartpd}} / Tele - {{item.telepd}}

- - - - - -
-
- - CityWise - - - - -

{{item.cityname}}

-

Full -{{item.fullpd}} / Smart -{{item.smartpd}} / Tele - {{item.telepd}}

- - - - - -
- -
-
-
\ No newline at end of file +
+ Tele + + +
+ + + --> + + +
+
+ + Alert warning + + + + + + + +

{{item.applicant_name}}

+

{{item.lender_applicant_id}}

+

{{item.entity_name}} - {{item.pd_status}}

+ + + + + +
+ + +
+ + Lenderwise + + + + + + + + +

{{item.full_name}} / {{item.city_name}}

+

{{item.PDTYPE}} -{{item.count}}

+ + + + + + + + +
+ +
+ + CityWise + + + + + + +

{{item.city_name}}

+ +

{{item.PDTYPE}} -{{item.count}} + + +

+ + + + + +
+
diff --git a/ng6-seed/src/app/dashboard/dashboard.component.scss b/ng6-seed/src/app/dashboard/dashboard.component.scss index 02efbd61c..fc7f8f15d 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.scss +++ b/ng6-seed/src/app/dashboard/dashboard.component.scss @@ -8,538 +8,547 @@ mat-card-title{ padding-bottom: 1rem; margin-bottom: 0px; } -.profile { - position: relative; - width: 100%; - height: 100%; - background: rgba(white, .25); - border-radius: 2px; - overflow: hidden; - box-shadow: 0 0 20px rgba(darken($red, 40%), .2); - &.pre-enter { - transform-origin: center center; - transform: scaleY(0); - .avatar { - transform-origin: center top; - transform: scaleY(0); - } - h1, - h2, - a.follow, - a.link { - opacity: 0; - transform: translateY(300px); - } - } - &.on-enter { - animation: scaleYIn 1000ms ease-out forwards; - .avatar { - animation: scaleYIn-small 750ms ease-out forwards 1000ms; - } - h1, - h2, - a.follow, - a.link { - opacity: 1; - animation: slideInUp 1000ms ease-out forwards; - } - h1 { - animation-delay: 1050ms; - } - h2 { - animation-delay: 1100ms; - } - a.follow { - animation-delay: 1250ms; - } - li { - &:nth-child(1) { - a.link { - animation-delay: 1300ms; - } - } - &:nth-child(2) { - a.link { - animation-delay: 1350ms; - } - } - &:nth-child(3) { - a.link { - animation-delay: 1400ms; - } - } - } - } -} +.donut-inner h5 { + margin-bottom: 5px; + margin-top: 0; + } +// .profile { +// position: relative; +// width: 100%; +// height: 100%; +// background: rgba(white, .25); +// border-radius: 2px; +// overflow: hidden; +// box-shadow: 0 0 20px rgba(darken($red, 40%), .2); +// &.pre-enter { +// transform-origin: center center; +// transform: scaleY(0); +// .avatar { +// transform-origin: center top; +// transform: scaleY(0); +// } +// h1, +// h2, +// a.follow, +// a.link { +// opacity: 0; +// transform: translateY(300px); +// } +// } +// &.on-enter { +// animation: scaleYIn 1000ms ease-out forwards; +// .avatar { +// animation: scaleYIn-small 750ms ease-out forwards 1000ms; +// } +// h1, +// h2, +// a.follow, +// a.link { +// opacity: 1; +// animation: slideInUp 1000ms ease-out forwards; +// } +// h1 { +// animation-delay: 1050ms; +// } +// h2 { +// animation-delay: 1100ms; +// } +// a.follow { +// animation-delay: 1250ms; +// } +// li { +// &:nth-child(1) { +// a.link { +// animation-delay: 1300ms; +// } +// } +// &:nth-child(2) { +// a.link { +// animation-delay: 1350ms; +// } +// } +// &:nth-child(3) { +// a.link { +// animation-delay: 1400ms; +// } +// } +// } +// } +// } -.background { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - background: white; - border-radius: 2px; -} +// .background { +// position: absolute; +// top: 0; +// left: 0; +// width: 100%; +// height: 100%; +// background: white; +// border-radius: 2px; +// } -.avatar, -.info { - width: 100%; - height: 50%; -} +// .avatar, +// .info { +// width: 100%; +// height: 50%; +// } -.avatar { - background: url('../../assets/images/1.jpg') no-repeat center center / cover; - clip-path: polygon(0 0, 100% 0, 100% 75%, 0% 100%); -} +// .avatar { +// background: url('../../assets/images/1.jpg') no-repeat center center / cover; +// clip-path: polygon(0 0, 100% 0, 100% 75%, 0% 100%); +// } -.prof-list { - li { - display: inline-block; - list-style: none; - } -} +// .prof-list { +// li { +// display: inline-block; +// list-style: none; +// } +// } -.info { - display: flex; - flex-flow: row wrap; - align-items: center; - align-content: center; - justify-content: center; - position: relative; - text-align: center; - h1 { - padding: $p $p 0; - width: 100%; - font-size: 24px; - font-weight: 800; - letter-spacing: 2px; - text-transform: uppercase; - } - h2, - a.follow { - display: block; +// .info { +// display: flex; +// flex-flow: row wrap; +// align-items: center; +// align-content: center; +// justify-content: center; +// position: relative; +// text-align: center; +// h1 { +// padding: $p $p 0; +// width: 100%; +// font-size: 24px; +// font-weight: 800; +// letter-spacing: 2px; +// text-transform: uppercase; +// } +// h2, +// a.follow { +// display: block; - border-radius: 2px; - padding: $p/2; - color: white; - font-size: 12px; - font-weight: 500; - letter-spacing: 1px; - text-transform: uppercase; - } - h2 { - background: $red; - background: linear-gradient(135deg, rgba(#f5825f, 1) 0%, rgba(#f5005f, 1) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5825f', endColorstr='#f5005f', GradientType=1); - } - a.follow { - margin-left: $p; - background: $blue; - background: linear-gradient(135deg, rgba(#05c8e0, 1) 0%, rgba(#057fe0, 1) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#05c8e0', endColorstr='#057fe0', GradientType=1); - &:hover, - &:focus { - background: #05c8e0; - background: linear-gradient(135deg, rgba(lighten(#05c8e0, 10%), 1) 0%, rgba(lighten(#057fe0, 10%), 1) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten(#05c8e0, 10%)', endColorstr='lighten(#057fe0, 10%)', GradientType=1); - } - &:active { - background: #057fe0; - background: linear-gradient(135deg, rgba(darken(#05c8e0, 5%), 1) 0%, rgba(darken(#057fe0, 5%), 1) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='darken(#05c8e0, 5%)', endColorstr='darken(#057fe0, 5%)', GradientType=1); - } - } - ul { - display: flex; - justify-content: center; - padding: $p/2; - width: 100%; - li { - padding: $p/2; - } - } - a.link { - display: block; - border-radius: 100%; - background: $blue; - width: 30px; - height: 30px; - line-height: 30px; - display: block; - } -} +// border-radius: 2px; +// padding: $p/2; +// color: white; +// font-size: 12px; +// font-weight: 500; +// letter-spacing: 1px; +// text-transform: uppercase; +// } +// h2 { +// background: $red; +// background: linear-gradient(135deg, rgba(#f5825f, 1) 0%, rgba(#f5005f, 1) 100%); +// filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5825f', endColorstr='#f5005f', GradientType=1); +// } +// a.follow { +// margin-left: $p; +// background: $blue; +// background: linear-gradient(135deg, rgba(#05c8e0, 1) 0%, rgba(#057fe0, 1) 100%); +// filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#05c8e0', endColorstr='#057fe0', GradientType=1); +// &:hover, +// &:focus { +// background: #05c8e0; +// background: linear-gradient(135deg, rgba(lighten(#05c8e0, 10%), 1) 0%, rgba(lighten(#057fe0, 10%), 1) 100%); +// filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten(#05c8e0, 10%)', endColorstr='lighten(#057fe0, 10%)', GradientType=1); +// } +// &:active { +// background: #057fe0; +// background: linear-gradient(135deg, rgba(darken(#05c8e0, 5%), 1) 0%, rgba(darken(#057fe0, 5%), 1) 100%); +// filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='darken(#05c8e0, 5%)', endColorstr='darken(#057fe0, 5%)', GradientType=1); +// } +// } +// ul { +// display: flex; +// justify-content: center; +// padding: $p/2; +// width: 100%; +// li { +// padding: $p/2; +// } +// } +// a.link { +// display: block; +// border-radius: 100%; +// background: $blue; +// width: 30px; +// height: 30px; +// line-height: 30px; +// display: block; +// } +// } -a.link { - &.portfolio { - background: #f5c8bf; - background: linear-gradient(135deg, rgba(#f5c8bf, 1) 0%, rgba(#f58dbf, 1) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5c8bf', endColorstr='#f58dbf', GradientType=1); - box-shadow: inset 0 0 10px rgba(#f58dbf, .5); - &:hover, - &:focus { - background: lighten(#f5c8bf, 5%); - background: linear-gradient(135deg, rgba(lighten(#f5c8bf, 5%), 1) 0%, rgba(lighten(#f58dbf, 5%), 1) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten(#f5c8bf, 5%)', endColorstr='lighten(#f58dbf, 5%)', GradientType=1); - box-shadow: inset 0 0 10px rgba(lighten(#f58dbf, 5%), .5); - } - &:active { - background: darken(#f5c8bf, 5%); - background: linear-gradient(135deg, rgba(darken(#f5c8bf, 5%), 1) 0%, rgba(darken(#f58dbf, 5%), 1) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='darken(#f5c8bf, 5%)', endColorstr='darken(#f58dbf, 5%)', GradientType=1); - box-shadow: inset 0 0 10px rgba(darken(#f58dbf, 5%), .5); - } - } - &.codepen { - background: #fcd000; - background: linear-gradient(135deg, rgba(#fcd000, 1) 0%, rgba(#fc9a00, 1) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fcd000', endColorstr='#fc9a00', GradientType=1); - box-shadow: inset 0 0 10px rgba(#fc9a00, .5); - &:hover, - &:focus { - background: lighten(#fcd000, 5%); - background: linear-gradient(135deg, rgba(lighten(#fcd000, 5%), 1) 0%, rgba(lighten(#fc9a00, 5%), 1) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten(#fcd000, 5%)', endColorstr='lighten(#fc9a00, 5%)', GradientType=1); - box-shadow: inset 0 0 10px rgba(lighten(#fc9a00, 5%), .5); - } - &:active { - background: darken(#fcd000, 5%); - background: linear-gradient(135deg, rgba(darken(#fcd000, 5%), 1) 0%, rgba(darken(#fc9a00, 5%), 1) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='darken(#fcd000, 5%)', endColorstr='darken(#fc9a00, 5%)', GradientType=1); - box-shadow: inset 0 0 10px rgba(darken(#fc9a00, 5%), .5); - } - } - &.github { - background: #41adc4; - background: linear-gradient(135deg, rgba(#41adc4, 1) 0%, rgba(#4183c4, 1) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#41adc4', endColorstr='#4183c4', GradientType=1); - box-shadow: inset 0 0 10px rgba(#4183c4, .5); - &:hover, - &:focus { - background: lighten(#41adc4, 5%); - background: linear-gradient(135deg, rgba(lighten(#41adc4, 5%), 1) 0%, rgba(lighten(#4183c4, 5%), 1) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten(#41adc4, 5%)', endColorstr='lighten(#4183c4, 5%)', GradientType=1); - box-shadow: inset 0 0 10px rgba(lighten(#4183c4, 5%), .5); - } - &:active { - background: darken(#41adc4, 5%); - background: linear-gradient(135deg, rgba(darken(#41adc4, 5%), 1) 0%, rgba(darken(#4183c4, 5%), 1) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='darken(#41adc4, 5%)', endColorstr='darken(#4183c4, 5%)', GradientType=1); - box-shadow: inset 0 0 10px rgba(darken(#4183c4, 5%), .5); - } - } -} +// a.link { +// &.portfolio { +// background: #f5c8bf; +// background: linear-gradient(135deg, rgba(#f5c8bf, 1) 0%, rgba(#f58dbf, 1) 100%); +// filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5c8bf', endColorstr='#f58dbf', GradientType=1); +// box-shadow: inset 0 0 10px rgba(#f58dbf, .5); +// &:hover, +// &:focus { +// background: lighten(#f5c8bf, 5%); +// background: linear-gradient(135deg, rgba(lighten(#f5c8bf, 5%), 1) 0%, rgba(lighten(#f58dbf, 5%), 1) 100%); +// filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten(#f5c8bf, 5%)', endColorstr='lighten(#f58dbf, 5%)', GradientType=1); +// box-shadow: inset 0 0 10px rgba(lighten(#f58dbf, 5%), .5); +// } +// &:active { +// background: darken(#f5c8bf, 5%); +// background: linear-gradient(135deg, rgba(darken(#f5c8bf, 5%), 1) 0%, rgba(darken(#f58dbf, 5%), 1) 100%); +// filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='darken(#f5c8bf, 5%)', endColorstr='darken(#f58dbf, 5%)', GradientType=1); +// box-shadow: inset 0 0 10px rgba(darken(#f58dbf, 5%), .5); +// } +// } +// &.codepen { +// background: #fcd000; +// background: linear-gradient(135deg, rgba(#fcd000, 1) 0%, rgba(#fc9a00, 1) 100%); +// filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fcd000', endColorstr='#fc9a00', GradientType=1); +// box-shadow: inset 0 0 10px rgba(#fc9a00, .5); +// &:hover, +// &:focus { +// background: lighten(#fcd000, 5%); +// background: linear-gradient(135deg, rgba(lighten(#fcd000, 5%), 1) 0%, rgba(lighten(#fc9a00, 5%), 1) 100%); +// filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten(#fcd000, 5%)', endColorstr='lighten(#fc9a00, 5%)', GradientType=1); +// box-shadow: inset 0 0 10px rgba(lighten(#fc9a00, 5%), .5); +// } +// &:active { +// background: darken(#fcd000, 5%); +// background: linear-gradient(135deg, rgba(darken(#fcd000, 5%), 1) 0%, rgba(darken(#fc9a00, 5%), 1) 100%); +// filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='darken(#fcd000, 5%)', endColorstr='darken(#fc9a00, 5%)', GradientType=1); +// box-shadow: inset 0 0 10px rgba(darken(#fc9a00, 5%), .5); +// } +// } +// &.github { +// background: #41adc4; +// background: linear-gradient(135deg, rgba(#41adc4, 1) 0%, rgba(#4183c4, 1) 100%); +// filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#41adc4', endColorstr='#4183c4', GradientType=1); +// box-shadow: inset 0 0 10px rgba(#4183c4, .5); +// &:hover, +// &:focus { +// background: lighten(#41adc4, 5%); +// background: linear-gradient(135deg, rgba(lighten(#41adc4, 5%), 1) 0%, rgba(lighten(#4183c4, 5%), 1) 100%); +// filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten(#41adc4, 5%)', endColorstr='lighten(#4183c4, 5%)', GradientType=1); +// box-shadow: inset 0 0 10px rgba(lighten(#4183c4, 5%), .5); +// } +// &:active { +// background: darken(#41adc4, 5%); +// background: linear-gradient(135deg, rgba(darken(#41adc4, 5%), 1) 0%, rgba(darken(#4183c4, 5%), 1) 100%); +// filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='darken(#41adc4, 5%)', endColorstr='darken(#4183c4, 5%)', GradientType=1); +// box-shadow: inset 0 0 10px rgba(darken(#4183c4, 5%), .5); +// } +// } +// } -@media only screen and (min-width: 470px) { - .profile { - display: flex; - &.pre-enter { - transform: scaleX(0); - .avatar { - transform-origin: left center; - transform: scaleX(0); - } - h1, - h2, - a.follow, - a.link { - transform: translateX(300px); - } - } - &.on-enter { - animation-name: scaleXIn; - .avatar { - animation-name: scaleXIn-small; - } - h1, - h2, - a.follow, - a.link { - animation-name: slideInLeft; - } - } - } - .background { - mix-blend-mode: overlay; - } - .avatar, - .info { - width: 50%; - height: 100%; - } - .avatar { - clip-path: polygon(0 0, 100% 0, 75% 100%, 0% 100%); - } -} +// @media only screen and (min-width: 470px) { +// .profile { +// display: flex; +// &.pre-enter { +// transform: scaleX(0); +// .avatar { +// transform-origin: left center; +// transform: scaleX(0); +// } +// h1, +// h2, +// a.follow, +// a.link { +// transform: translateX(300px); +// } +// } +// &.on-enter { +// animation-name: scaleXIn; +// .avatar { +// animation-name: scaleXIn-small; +// } +// h1, +// h2, +// a.follow, +// a.link { +// animation-name: slideInLeft; +// } +// } +// } +// .background { +// mix-blend-mode: overlay; +// } +// .avatar, +// .info { +// width: 50%; +// height: 100%; +// } +// .avatar { +// clip-path: polygon(0 0, 100% 0, 75% 100%, 0% 100%); +// } +// } -@media only screen and (min-width: 470px) and (min-height: 600px) { - .profile { - max-height: 400px; - } -} +// @media only screen and (min-width: 470px) and (min-height: 600px) { +// .profile { +// max-height: 400px; +// } +// } -/* https://goo.gl/jIUq3E */ +// /* https://goo.gl/jIUq3E */ -@keyframes scaleXIn { - 0% { - transform: matrix3d(0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 4.7% { - transform: matrix3d(0.45, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 9.41% { - transform: matrix3d(0.883, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 14.11% { - transform: matrix3d(1.141, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 18.72% { - transform: matrix3d(1.212, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 24.32% { - transform: matrix3d(1.151, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 29.93% { - transform: matrix3d(1.048, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 35.54% { - transform: matrix3d(0.979, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 41.04% { - transform: matrix3d(0.961, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 52.15% { - transform: matrix3d(0.991, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 63.26% { - transform: matrix3d(1.007, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 85.49% { - transform: matrix3d(0.999, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 100% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } -} +// @keyframes scaleXIn { +// 0% { +// transform: matrix3d(0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 4.7% { +// transform: matrix3d(0.45, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 9.41% { +// transform: matrix3d(0.883, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 14.11% { +// transform: matrix3d(1.141, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 18.72% { +// transform: matrix3d(1.212, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 24.32% { +// transform: matrix3d(1.151, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 29.93% { +// transform: matrix3d(1.048, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 35.54% { +// transform: matrix3d(0.979, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 41.04% { +// transform: matrix3d(0.961, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 52.15% { +// transform: matrix3d(0.991, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 63.26% { +// transform: matrix3d(1.007, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 85.49% { +// transform: matrix3d(0.999, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 100% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// } -/* https://goo.gl/auuhcg */ +// /* https://goo.gl/auuhcg */ -@keyframes scaleYIn { - 0% { - transform: matrix3d(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 4.7% { - transform: matrix3d(1, 0, 0, 0, 0, 0.45, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 9.41% { - transform: matrix3d(1, 0, 0, 0, 0, 0.883, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 14.11% { - transform: matrix3d(1, 0, 0, 0, 0, 1.141, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 18.72% { - transform: matrix3d(1, 0, 0, 0, 0, 1.212, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 24.32% { - transform: matrix3d(1, 0, 0, 0, 0, 1.151, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 29.93% { - transform: matrix3d(1, 0, 0, 0, 0, 1.048, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 35.54% { - transform: matrix3d(1, 0, 0, 0, 0, 0.979, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 41.04% { - transform: matrix3d(1, 0, 0, 0, 0, 0.961, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 52.15% { - transform: matrix3d(1, 0, 0, 0, 0, 0.991, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 63.26% { - transform: matrix3d(1, 0, 0, 0, 0, 1.007, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 85.49% { - transform: matrix3d(1, 0, 0, 0, 0, 0.999, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 100% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } -} +// @keyframes scaleYIn { +// 0% { +// transform: matrix3d(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 4.7% { +// transform: matrix3d(1, 0, 0, 0, 0, 0.45, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 9.41% { +// transform: matrix3d(1, 0, 0, 0, 0, 0.883, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 14.11% { +// transform: matrix3d(1, 0, 0, 0, 0, 1.141, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 18.72% { +// transform: matrix3d(1, 0, 0, 0, 0, 1.212, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 24.32% { +// transform: matrix3d(1, 0, 0, 0, 0, 1.151, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 29.93% { +// transform: matrix3d(1, 0, 0, 0, 0, 1.048, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 35.54% { +// transform: matrix3d(1, 0, 0, 0, 0, 0.979, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 41.04% { +// transform: matrix3d(1, 0, 0, 0, 0, 0.961, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 52.15% { +// transform: matrix3d(1, 0, 0, 0, 0, 0.991, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 63.26% { +// transform: matrix3d(1, 0, 0, 0, 0, 1.007, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 85.49% { +// transform: matrix3d(1, 0, 0, 0, 0, 0.999, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 100% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// } -/* https://goo.gl/dNBqrt */ +// /* https://goo.gl/dNBqrt */ -@keyframes scaleXIn-small { - 0% { - transform: matrix3d(0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 6.31% { - transform: matrix3d(0.384, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 12.51% { - transform: matrix3d(0.621, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 18.82% { - transform: matrix3d(0.771, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 25.03% { - transform: matrix3d(0.862, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 37.54% { - transform: matrix3d(0.952, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 50.05% { - transform: matrix3d(0.984, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 75.08% { - transform: matrix3d(0.999, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 100% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } -} +// @keyframes scaleXIn-small { +// 0% { +// transform: matrix3d(0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 6.31% { +// transform: matrix3d(0.384, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 12.51% { +// transform: matrix3d(0.621, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 18.82% { +// transform: matrix3d(0.771, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 25.03% { +// transform: matrix3d(0.862, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 37.54% { +// transform: matrix3d(0.952, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 50.05% { +// transform: matrix3d(0.984, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 75.08% { +// transform: matrix3d(0.999, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 100% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// } -/* https://goo.gl/jZL0uj */ +// /* https://goo.gl/jZL0uj */ -@keyframes scaleYIn-small { - 0% { - transform: matrix3d(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 6.31% { - transform: matrix3d(1, 0, 0, 0, 0, 0.384, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 12.51% { - transform: matrix3d(1, 0, 0, 0, 0, 0.621, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 18.82% { - transform: matrix3d(1, 0, 0, 0, 0, 0.771, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 25.03% { - transform: matrix3d(1, 0, 0, 0, 0, 0.862, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 37.54% { - transform: matrix3d(1, 0, 0, 0, 0, 0.952, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 50.05% { - transform: matrix3d(1, 0, 0, 0, 0, 0.984, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 75.08% { - transform: matrix3d(1, 0, 0, 0, 0, 0.999, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } - 100% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } -} +// @keyframes scaleYIn-small { +// 0% { +// transform: matrix3d(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 6.31% { +// transform: matrix3d(1, 0, 0, 0, 0, 0.384, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 12.51% { +// transform: matrix3d(1, 0, 0, 0, 0, 0.621, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 18.82% { +// transform: matrix3d(1, 0, 0, 0, 0, 0.771, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 25.03% { +// transform: matrix3d(1, 0, 0, 0, 0, 0.862, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 37.54% { +// transform: matrix3d(1, 0, 0, 0, 0, 0.952, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 50.05% { +// transform: matrix3d(1, 0, 0, 0, 0, 0.984, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 75.08% { +// transform: matrix3d(1, 0, 0, 0, 0, 0.999, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// 100% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// } -/* https://goo.gl/Ne0Mkr */ +// /* https://goo.gl/Ne0Mkr */ -@keyframes slideInLeft { - 0% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 300, 0, 0, 1); - } - 6.31% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 184.858, 0, 0, 1); - } - 12.51% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 113.68, 0, 0, 1); - } - 18.82% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 68.663, 0, 0, 1); - } - 25.03% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 41.37, 0, 0, 1); - } - 37.54% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 14.382, 0, 0, 1); - } - 50.05% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 4.724, 0, 0, 1); - } - 75.08% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.381, 0, 0, 1); - } - 100% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } -} +// @keyframes slideInLeft { +// 0% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 300, 0, 0, 1); +// } +// 6.31% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 184.858, 0, 0, 1); +// } +// 12.51% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 113.68, 0, 0, 1); +// } +// 18.82% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 68.663, 0, 0, 1); +// } +// 25.03% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 41.37, 0, 0, 1); +// } +// 37.54% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 14.382, 0, 0, 1); +// } +// 50.05% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 4.724, 0, 0, 1); +// } +// 75.08% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.381, 0, 0, 1); +// } +// 100% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// } -/* https://goo.gl/MSqtd5 */ +// /* https://goo.gl/MSqtd5 */ -@keyframes slideInUp { - 0% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 300, 0, 1); - } - 6.31% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 184.858, 0, 1); - } - 12.51% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 113.68, 0, 1); - } - 18.82% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 68.663, 0, 1); - } - 25.03% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 41.37, 0, 1); - } - 37.54% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 14.382, 0, 1); - } - 50.05% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 4.724, 0, 1); - } - 75.08% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0.381, 0, 1); - } - 100% { - transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - } -} +// @keyframes slideInUp { +// 0% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 300, 0, 1); +// } +// 6.31% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 184.858, 0, 1); +// } +// 12.51% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 113.68, 0, 1); +// } +// 18.82% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 68.663, 0, 1); +// } +// 25.03% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 41.37, 0, 1); +// } +// 37.54% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 14.382, 0, 1); +// } +// 50.05% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 4.724, 0, 1); +// } +// 75.08% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0.381, 0, 1); +// } +// 100% { +// transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); +// } +// } -//wheather -.card-wheather { - height: 220px; - color: #fff; -} +// //wheather +// .card-wheather { +// height: 220px; +// color: #fff; +// } -.city { +// .city { - font-size: 26px; -} +// font-size: 26px; +// } -.date { - font-size: 20px; - line-height: 40px; -} +// .date { +// font-size: 20px; +// line-height: 40px; +// } -.sun { - height: 70px; -} +// .sun { +// height: 70px; +// } -.grad-blue { - background: linear-gradient(58deg, #f44336, #673ab7); - color: #fff; -} +// .grad-blue { +// background: linear-gradient(58deg, #f44336, #673ab7); +// color: #fff; +// } -.grad-green { - background: linear-gradient(58deg, #009688, #673ab7); - color: #fff; -} +// .grad-green { +// background: linear-gradient(58deg, #009688, #673ab7); +// color: #fff; +// } -.grad-red { - background: linear-gradient(58deg, #f44336, #673ab7); - color: #fff; -} -.card-wheather{ +// .grad-red { +// background: linear-gradient(58deg, #f44336, #673ab7); +// color: #fff; +// } +// .card-wheather{ +// padding: 2rem; +// } +// .temp { +// font-size: 50px; +// display: inline-block; +// } + + +.chart{ padding: 2rem; -} -.temp { - font-size: 50px; - display: inline-block; -} +} \ No newline at end of file diff --git a/ng6-seed/src/app/dashboard/dashboard.component.ts b/ng6-seed/src/app/dashboard/dashboard.component.ts index d4173c88b..e3797f2b0 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.ts +++ b/ng6-seed/src/app/dashboard/dashboard.component.ts @@ -1,4 +1,10 @@ -import { Component } from '@angular/core'; +//import { Component } from '@angular/core'; +import {Component, NgModule, ElementRef, Inject, ViewChild} from '@angular/core' +import {BrowserModule} from '@angular/platform-browser' +import {ChartsModule, Color} from 'ng2-charts'; +//import { MastersService } from './../service/masters/masters.service' +import { DashboardService } from './dashboard.service'; +import { BaseChartDirective } from 'ng2-charts/ng2-charts'; @Component({ selector: 'app-dashboard', @@ -8,195 +14,564 @@ import { Component } from '@angular/core'; export class DashboardComponent { - - public showXAxis = true; - public showYAxis = true; - public gradient = true; - public showLegend = false; - public showXAxisLabel = true; - public xAxisLabel = 'Status'; - public showYAxisLabel = true; - public yAxisLabel = 'PD'; - view: any[]; - width =900; - height= 250; - public colorScheme = { - domain: ['#673ab7', '#f44336', '#009688 ', '#2196f3', '#234278 ', '#2a1653'] - }; - public autoScale = true; - constructor() { - } - ngOnInit(){ - this.view = [this.width, this.height]; + dashboardTitle = 'Monthly Status'; + + @ViewChild('mycanvas') + doughnutChartDataForFullPD:any[]=[]; + doughnutChartDataForSmartPD:any[]=[]; + doughnutChartDataForTelePD:any[]=[]; + TempDataFullPD :number[]=[]; + TempDataSmartPD :number[]=[]; + TempDataTelePD :number[]=[]; + total1: number = 0; + total2: number = 0; + total3: number = 0; + doughnutChartName:any; + citywisepd : any[]; + lenderpd :any[]; + message : any[]; + Status = false; + + // globalChartOptionsFullPD: any = { + // responsive: false, + // legend: { + // display: false, + // position: 'bottom' + // } + // }; + // globalChartOptionsSmartPD: any = { + // responsive: false, + // legend: { + // display: false, + // position: 'bottom' + // } + // }; + globalChartOptions: any = { + responsive: false, + legend: { + display: false, + position: 'bottom' + } + }; + + TodayFullPD:any = []; + MonthlyFullPD:any = []; + + constructor(private _dashboardService: DashboardService) { - } -//pie chart - single: Object[] = [ - { - name: 'Germany', - value: 40632 - }, - { - name: 'USA', - value: 49737 - }, - { - name: 'France', - value: 36745 - }, - { - name: 'UK', - value: 36240 - }, - { - name: 'Spain', - value: 33000 - }, - { - name: 'Italy', - value: 35800 } -]; - //Full Pd Data - full: Object[] = [ - { - name: 'Triggered', - value: 45 - }, - { - name: 'Allocated', - value: 50 - }, - { - name: 'Scheduled', - value: 36 - }, - { - name: 'InProgress', - value: 90 - }, - { - name: 'Completed', - value: 56 - }, - { - name: 'QC Completed', - value: 81 - } - ]; - //smart PD data - smart: Object[] = [ - { - name: 'Triggered', - value: 65 - }, - { - name: 'Allocated', - value: 20 - }, - { - name: 'Scheduled', - value: 80 - }, - { - name: 'InProgress', - value: 60 - }, - { - name: 'Completed', - value: 26 - }, - { - name: 'QC Completed', - value: 51 - } - ]; - //Tele PD Data - tele: Object[] = [ - { - name: 'Triggered', - value: 95 - }, - { - name: 'Allocated', - value: 59 - }, - { - name: 'Scheduled', - value: 45 - }, - { - name: 'InProgress', - value: 25 - }, - { - name: 'Completed', - value: 36 - }, - { - name: 'QC Completed', - value: 49 - } - ]; - // //Lender wise PD Triggered - lenderpd: Object[] = [{ - lendername:'ICICI', - billingaddr:'Bangalore', - fullpd:'19', - smartpd:'6', - telepd:'10', - }, { - lendername:'IOB', - billingaddr:'Chennai', - fullpd:'10', - smartpd:'5', - telepd:'7', - }, { - lendername:'SBI', - billingaddr:'Pune', - fullpd:'16', - smartpd:'3', - telepd:'33', - }, ]; + // Doughnut + //name: "DoughnutTextInside" + ngOnInit(){ + + this.GetData(); + this.getDoNUT(); + + } + +GetData(){ + this._dashboardService.getLenderDetail().subscribe(data => { + //console.log('Lender');console.log(data); + this.TodayFullPD = data.records; - //City Wise PD Triggered - citywisepd: Object[] = [{ - cityname: 'Bangalore', - fullpd:'45', - smartpd:'17', - telepd:'10', - }, { - cityname: 'Chennai', - fullpd:'33', - smartpd:'16', - telepd:'8', - }, { - cityname: 'Salem', - fullpd:'22', - smartpd:'12', - telepd:'2', - } ]; + // console.log(this.TodayFullPD); + // console.log(this.TodayFullPD.current_day); + // console.log(this.TodayFullPD.current_week); + // console.log(this.TodayFullPD.current_month); + if(this.TodayFullPD.current_day.length != '0'){ + //console.log('If Condition day'); + } + else{ + //console.log('Else Condition day'); + } - // //Same status - message: Object[] = [{ - applicantname: 'Saravana', - applicantid:'ICICITN0118000354', - lendername:'ICICI', - status:'Allocated', - photo: 'assets/images/face3.jpg', - }, { - applicantname: 'Kumaran', - applicantid:'IOBKA0418000578', - lendername:'IOB', - status:'Allocated', - photo: 'assets/images/face6.jpg', - }, { - applicantname: 'Priya', - applicantid:'SBIGA0118000241', - lendername:'SBI', - status:'Triggered', - photo: 'assets/images/face4.jpg', - } ]; + if(this.TodayFullPD.current_week.length != '0'){ + //console.log('If Condition week'); + } + else{ + //console.log('Else Condition week'); + } + + if(this.TodayFullPD.current_month.length != '0'){ + this.lenderpd = this.TodayFullPD.current_month; + console.log('******************** lender'); + console.log(this.lenderpd); + + // for(let contact of this.TodayFullPD.current_month) { + // let message = contact; + // } + + } + else{ + //console.log('Else Condition month'); + } +}); + this._dashboardService.getAlertDetail().subscribe(data => { + console.log('Alert*********************************');console.log(data); + this.message = data.records; + console.log(this.message); + }); + this._dashboardService.getCityDetail().subscribe(data => {console.log('City');console.log(data); + this.TodayFullPD = data.records; + + // console.log(this.TodayFullPD); + // console.log(this.TodayFullPD.current_day); + // console.log(this.TodayFullPD.current_week); + // console.log(this.TodayFullPD.current_month); + console.log('Whole',this.TodayFullPD); + console.log('Today only',this.TodayFullPD.current_day); + console.log('This week',this.TodayFullPD.current_week); + console.log('This month',this.TodayFullPD.current_month); + if(this.TodayFullPD.current_day.length != '0'){ + //console.log('If Condition day'); + } + else{ + //console.log('Else Condition day'); + } + if(this.TodayFullPD.current_week.length != '0'){ + //console.log('If Condition week'); + } + else{ + //console.log('Else Condition week'); + } + if(this.TodayFullPD.current_month.length != '0'){ + this.citywisepd = this.TodayFullPD.current_month; + //console.log('citywisepd'); + //console.log(this.citywisepd); + //for(let contact of this.TodayFullPD.current_month) { + // let message = contact; + //} + + } + else{ + //console.log('Else Condition month'); + } +}); } +getDoNUT(){ + this._dashboardService.getPDDetailForDoughnut().subscribe(data => { + this.MonthlyFullPD = data.records; + + console.log('whole',this.MonthlyFullPD); + console.log('Today',this.MonthlyFullPD.current_day); + console.log('week',this.MonthlyFullPD.current_week); + console.log('month',this.MonthlyFullPD.current_month); + if(this.MonthlyFullPD.current_day.length != '0'){ + //console.log('If Condition day'); + } + else{ + //console.log('Else Condition day'); + } + if(this.MonthlyFullPD.current_week.length != '0'){ + //console.log('If Condition week'); + } + else{ + //console.log('Else Condition week'); + } + if(this.MonthlyFullPD.current_month.length != '0'){ + //console.log('If Condition monthLY'); + //this.citydatas = this.citydatas.filter(city=>city.isactive == 1 ); + let Monthly = this.MonthlyFullPD.current_month; + let MonthlyFullPDArr = Monthly.filter(arr=>arr.PDTYPE == 'FULL' ); + let MonthlySmartPDArr = Monthly.filter(arr=>arr.PDTYPE == 'SMART' ); + let MonthlyTelePDArr = Monthly.filter(arr=>arr.PDTYPE == 'TELE' ); + + + let TriggedIndexvalue = this.doughnutChartLabels.indexOf('Triggered'); + let AllocatedIndexvalue = this.doughnutChartLabels.indexOf('Allocated'); + let ScheduledIndexvalue = this.doughnutChartLabels.indexOf('Scheduled'); + let InProgressIndexvalue = this.doughnutChartLabels.indexOf('InProgress'); + let CompletedIndexvalue = this.doughnutChartLabels.indexOf('Completed'); + let QCCompletedIndexvalue = this.doughnutChartLabels.indexOf('QC Completed'); + + let TriggerFullPDvalue = MonthlyFullPDArr.filter(arr=>arr.pd_status == 'TRIGGERED'); + if(TriggerFullPDvalue.length != '0'){ + //console.log('console triggered value',TriggerFullPDvalue); + for(let FPD of TriggerFullPDvalue){ + let y = +FPD.count; + this.total1 = this.total1+y; + this.TempDataFullPD[TriggedIndexvalue] = y; + } + } + else{ + this.TempDataFullPD[TriggedIndexvalue] = 0; + } + + let AllocatedFullPDvalue = MonthlyFullPDArr.filter(arr=>arr.pd_status == 'ALLOCATED'); + if(AllocatedFullPDvalue.length != '0'){ + for(let FPD of AllocatedFullPDvalue){ + let y = +FPD.count; + this.total1 = this.total1+y; + this.TempDataFullPD[AllocatedIndexvalue] = y; + } + } + else{ + this.TempDataFullPD[AllocatedIndexvalue] = 0; + } + + let ScheduledFullPDvalue = MonthlyFullPDArr.filter(arr=>arr.pd_status == 'SCHEDULED'); + if(ScheduledFullPDvalue.length != '0'){ + for(let FPD of ScheduledFullPDvalue){ + let y = +FPD.count; + this.total1 = this.total1+y; + this.TempDataFullPD[ScheduledIndexvalue] = y; + } + //let y = +ScheduledFullPDvalue.count; + + } + else{ + this.TempDataFullPD[ScheduledIndexvalue] = 0; + } + + let InProgressFullPDvalue = MonthlyFullPDArr.filter(arr=>arr.pd_status == 'INPROGRESS'); + if(InProgressFullPDvalue.length != '0'){ + for(let FPD of InProgressFullPDvalue){ + let y = +FPD.count; + this.total1 = this.total1+y; + this.TempDataFullPD[InProgressIndexvalue] = y; + } + //let y = +InProgressFullPDvalue.count; + + } + else{ + this.TempDataFullPD[InProgressIndexvalue] = 0; + } + + let CompletedFullPDvalue = MonthlyFullPDArr.filter(arr=>arr.pd_status == 'COMPLETED'); + if(CompletedFullPDvalue.length != '0'){ + for(let FPD of CompletedFullPDvalue){ + let y = +FPD.count; + this.total1 = this.total1+y; + this.TempDataFullPD[CompletedIndexvalue] = y; + } + //let y = +CompletedFullPDvalue.count; + + } + else{ + this.TempDataFullPD[CompletedIndexvalue] = 0; + } + + let QCCompletedFullPDvalue = MonthlyFullPDArr.filter(arr=>arr.pd_status == "QC_COMPLETED"); + if(QCCompletedFullPDvalue.length != '0'){ + for(let FPD of QCCompletedFullPDvalue){ + let y = +FPD.count; + this.total1 = this.total1+y; + this.TempDataFullPD[QCCompletedIndexvalue] = y; + } + //let y = +QCCompletedFullPDvalue.count; + + } + else{ + this.TempDataFullPD[QCCompletedIndexvalue] = 0; + } + + let TriggerSmartPDvalue = MonthlySmartPDArr.filter(arr=>arr.pd_status == 'TRIGGERED'); + if(TriggerSmartPDvalue.length != '0'){ + + for(let FPD of TriggerSmartPDvalue){ + let y = +FPD.count; + this.total2 = this.total2+y; + this.TempDataSmartPD[TriggedIndexvalue] = y; + } + } + else{ + this.TempDataSmartPD[TriggedIndexvalue] = 0; + } + + let AllocatedSmartPDvalue = MonthlySmartPDArr.filter(arr=>arr.pd_status == 'ALLOCATED'); + if(AllocatedSmartPDvalue.length != '0'){ + for(let FPD of AllocatedSmartPDvalue){ + let y = +FPD.count; + this.total2 = this.total2+y; + this.TempDataSmartPD[AllocatedIndexvalue] = y; + } + } + else{ + this.TempDataSmartPD[AllocatedIndexvalue] = 0; + } + + let ScheduledSmartPDvalue = MonthlySmartPDArr.filter(arr=>arr.pd_status == 'SCHEDULED'); + if(ScheduledSmartPDvalue.length != '0'){ + for(let FPD of ScheduledSmartPDvalue){ + let y = +FPD.count; + this.total2 = this.total2+y; + this.TempDataSmartPD[ScheduledIndexvalue] = y; + } + //let y = +ScheduledFullPDvalue.count; + + } + else{ + this.TempDataSmartPD[ScheduledIndexvalue] = 0; + } + + let InProgressSmartPDvalue = MonthlySmartPDArr.filter(arr=>arr.pd_status == 'INPROGRESS'); + if(InProgressSmartPDvalue.length != '0'){ + for(let FPD of InProgressSmartPDvalue){ + let y = +FPD.count; + this.total2 = this.total2+y; + this.TempDataSmartPD[InProgressIndexvalue] = y; + } + //let y = +InProgressFullPDvalue.count; + + } + else{ + this.TempDataSmartPD[InProgressIndexvalue] = 0; + } + + let CompletedSmartPDvalue = MonthlySmartPDArr.filter(arr=>arr.pd_status == 'COMPLETED'); + if(CompletedSmartPDvalue.length != '0'){ + for(let FPD of CompletedSmartPDvalue){ + let y = +FPD.count; + this.total2 = this.total2+y; + this.TempDataSmartPD[CompletedIndexvalue] = y; + } + //let y = +CompletedFullPDvalue.count; + + } + else{ + this.TempDataSmartPD[CompletedIndexvalue] = 0; + } + + let QCCompletedSmartPDvalue = MonthlySmartPDArr.filter(arr=>arr.pd_status == "QC_COMPLETED"); + if(QCCompletedSmartPDvalue.length != '0'){ + for(let FPD of QCCompletedSmartPDvalue){ + let y = +FPD.count; + this.total2 = this.total2+y; + this.TempDataSmartPD[QCCompletedIndexvalue] = y; + } + //let y = +QCCompletedFullPDvalue.count; + + } + else{ + this.TempDataSmartPD[QCCompletedIndexvalue] = 0; + } + + let TriggerTelePDvalue = MonthlyTelePDArr.filter(arr=>arr.pd_status == 'TRIGGERED'); + if(TriggerTelePDvalue.length != '0'){ + //console.log('console triggered value',TriggerTelePDvalue); + for(let FPD of TriggerTelePDvalue){ + let y = +FPD.count; + this.total3 = this.total3+y; + this.TempDataTelePD[TriggedIndexvalue] = y; + } + } + else{ + this.TempDataTelePD[TriggedIndexvalue] = 0; + } + + let AllocatedTelePDvalue = MonthlyTelePDArr.filter(arr=>arr.pd_status == 'ALLOCATED'); + if(AllocatedTelePDvalue.length != '0'){ + for(let FPD of AllocatedTelePDvalue){ + let y = +FPD.count; + this.total3 = this.total3+y; + this.TempDataTelePD[AllocatedIndexvalue] = y; + } + } + else{ + this.TempDataTelePD[AllocatedIndexvalue] = 0; + } + + let ScheduledTelePDvalue = MonthlyTelePDArr.filter(arr=>arr.pd_status == 'SCHEDULED'); + if(ScheduledTelePDvalue.length != '0'){ + for(let FPD of ScheduledTelePDvalue){ + let y = +FPD.count; + this.total3 = this.total3+y; + this.TempDataTelePD[ScheduledIndexvalue] = y; + } + //let y = +ScheduledFullPDvalue.count; + + } + else{ + this.TempDataTelePD[ScheduledIndexvalue] = 0; + } + + let InProgressTelePDvalue = MonthlyTelePDArr.filter(arr=>arr.pd_status == 'INPROGRESS'); + if(InProgressTelePDvalue.length != '0'){ + for(let FPD of InProgressTelePDvalue){ + let y = +FPD.count; + this.total3 = this.total3+y; + this.TempDataTelePD[InProgressIndexvalue] = y; + } + //let y = +InProgressFullPDvalue.count; + + } + else{ + this.TempDataTelePD[InProgressIndexvalue] = 0; + } + + let CompletedTelePDvalue = MonthlyTelePDArr.filter(arr=>arr.pd_status == 'COMPLETED'); + if(CompletedTelePDvalue.length != '0'){ + for(let FPD of CompletedTelePDvalue){ + let y = +FPD.count; + this.total3 = this.total3+y; + this.TempDataTelePD[CompletedIndexvalue] = y; + } + //let y = +CompletedFullPDvalue.count; + + } + else{ + this.TempDataTelePD[CompletedIndexvalue] = 0; + } + + let QCCompletedTelePDvalue = MonthlyTelePDArr.filter(arr=>arr.pd_status == "QC_COMPLETED"); + if(QCCompletedTelePDvalue.length != '0'){ + for(let FPD of QCCompletedTelePDvalue){ + let y = +FPD.count; + this.total3 = this.total3+y; + this.TempDataTelePD[QCCompletedIndexvalue] = y; + } + //let y = +QCCompletedFullPDvalue.count; + + } + else{ + this.TempDataTelePD[QCCompletedIndexvalue] = 0; + } + + // y: number + + //console.log(MonthlyFullPDArr.pd_status); + // for(let FPD of MonthlyFullPDArr){ + + // if(FPD.pd_status == 'TRIGGERED'){ + // console.log('PD Status'); + // let Indexvalue = this.doughnutChartLabels.indexOf('Triggered'); + // let y = +FPD.count; // y: number + // console.log('Initial',this.TempDataFullPD); + // this.TempDataFullPD[Indexvalue] = y; + // console.log(this.TempDataFullPD); + // } + // else{ + // let Indexvalue = this.doughnutChartLabels.indexOf('Triggered'); + // this.TempDataFullPD[Indexvalue] = 0; + // } + + // // if(contact.pd_status == 'TRIGGERED' && contact.PDTYPE == 'FULL'){ + // // let Indexvalue = this.doughnutChartLabels.indexOf('Triggered'); + // // var y = +contact.count; // y: number + // // console.log('Initial',this.TempDataFullPD); + // // this.TempDataFullPD[Indexvalue] = y; + // // console.log(this.TempDataFullPD); + // // } + // // else{ + // // let Indexvalue = this.doughnutChartLabels.indexOf('Triggered'); + // // this.TempDataFullPD[Indexvalue] = 0; + + // // } + // if(FPD.pd_status == 'ALLOCATED'){ + // let Indexvalue = this.doughnutChartLabels.indexOf('Allocated'); + // var y = +FPD.count; // y: number + // // console.log(this.TempDataFullPD); + // this.TempDataFullPD[Indexvalue] = y; + // //console.log('allocated b4',TempDataFullPD); + // } + // else{ + // let Indexvalue = this.doughnutChartLabels.indexOf('Allocated'); + // this.TempDataFullPD[Indexvalue] = 0; + // } + // if(FPD.pd_status == 'INPROGRESS'){ + // let Indexvalue = this.doughnutChartLabels.indexOf('InProgress'); + // var y = +FPD.count; // y: number + // this.TempDataFullPD[Indexvalue] = y; + // //console.log('b4',TempDataFullPD); + // } + // else{ + // let Indexvalue = this.doughnutChartLabels.indexOf('InProgress'); + // this.TempDataFullPD[Indexvalue] = 0; + // } + // if(FPD.pd_status == 'SCHEDULED'){ + // let Indexvalue = this.doughnutChartLabels.indexOf('Scheduled'); + // var y = +FPD.count; // y: number + // this.TempDataFullPD[Indexvalue] = y; + // //console.log('b4',TempDataFullPD); + // } + // else{ + // let Indexvalue = this.doughnutChartLabels.indexOf('Scheduled'); + // this.TempDataFullPD[Indexvalue] = 0; + // //console.log('d',TempDataFullPD); + // } + // if(FPD.pd_status == 'COMPLETED'){ + // let Indexvalue = this.doughnutChartLabels.indexOf('Completed'); + // var y = +FPD.count; // y: number + // this.TempDataFullPD[Indexvalue] = y; + // //console.log('allocated',TempDataFullPD); + // } + // else{ + // let Indexvalue = this.doughnutChartLabels.indexOf('Completed'); + // this.TempDataFullPD[Indexvalue] = 0; + // } + // //return TempDataFullPD; + + // if(FPD.pd_status == 'QC COMPLETED'){ + // let Indexvalue = this.doughnutChartLabels.indexOf('QC Completed'); + // var y = +FPD.count; // y: number + // this.TempDataFullPD[Indexvalue] = y; + // //console.log('allocated',TempDataFullPD); + // } + // else{ + // let Indexvalue = this.doughnutChartLabels.indexOf('QC Completed'); + // this.TempDataFullPD[Indexvalue] = 0; + // //console.log('Final Data',TempDataFullPD); + // } + // //console.log('inside',this.TempDataFullPD); + // } + //this.doughnutChartDataForFullPD = [3,4,5,6,7,8]; + } + + else{ + //console.log('Else Condition month'); + } + this.doughnutChartDataForFullPD = this.TempDataFullPD; + this.doughnutChartDataForSmartPD = this.TempDataSmartPD; + this.doughnutChartDataForTelePD = this.TempDataTelePD; + + console.log('Final full Data Completed',this.doughnutChartDataForFullPD); + console.log('Temp full Data',this.TempDataFullPD); + console.log('Final Smart Data Completed',this.doughnutChartDataForSmartPD); + console.log('Temp Smart Data',this.TempDataSmartPD); + console.log('Final Tele Data Completed',this.doughnutChartDataForTelePD); + console.log('Temp Tele Data',this.TempDataTelePD); + + }) +} + +// setTimeout(() => { +// this.datasets = [{ +// data: [12, 19, 3, 5, 2, 3] +// }]; +// }, 100); + +doughnutChartColors: any[] = [{ + backgroundColor: ['#f44336', '#3f51b5', '#ffeb3b', '#4caf50', '#2196f3','#673ab7'] +}]; + +doughnutChartType = 'doughnut'; +doughnutChartLabels: string[] = ['Triggered', 'Allocated','Scheduled','InProgress','Completed','QC Completed']; +doughnutOptionsFullPD: any = Object.assign({ + elements: { + arc: { + borderWidth: 0.2 + } + } +}, this.globalChartOptions); + +doughnutOptionsSmartPD: any = Object.assign({ + elements: { + arc: { + borderWidth: 0.2 + } + } +}, this.globalChartOptions); + +doughnutOptionsTelePD: any = Object.assign({ + elements: { + arc: { + borderWidth: 0.2 + } + } +}, this.globalChartOptions); + +chartfunction(){ this.Status = true; } + +} \ No newline at end of file diff --git a/ng6-seed/src/app/dashboard/dashboard.module.ts b/ng6-seed/src/app/dashboard/dashboard.module.ts index ac863a047..89e784107 100644 --- a/ng6-seed/src/app/dashboard/dashboard.module.ts +++ b/ng6-seed/src/app/dashboard/dashboard.module.ts @@ -11,6 +11,9 @@ import { NgxDatatableModule } from '@swimlane/ngx-datatable'; import { DashboardComponent } from './dashboard.component'; import { DashboardRoutes } from './dashboard.routing'; +/** Dashboard Service */ +import { DashboardService } from './dashboard.service'; + @NgModule({ imports: [ CommonModule, @@ -27,6 +30,7 @@ import { DashboardRoutes } from './dashboard.routing'; NgxDatatableModule, FlexLayoutModule ], + providers: [ DashboardService ], declarations: [ DashboardComponent ] }) diff --git a/ng6-seed/src/app/dashboard/dashboard.service.spec.ts b/ng6-seed/src/app/dashboard/dashboard.service.spec.ts new file mode 100644 index 000000000..09bd58774 --- /dev/null +++ b/ng6-seed/src/app/dashboard/dashboard.service.spec.ts @@ -0,0 +1,12 @@ +import { TestBed } from '@angular/core/testing'; + +import { DashboardService } from './dashboard.service'; + +describe('DashboardService', () => { + beforeEach(() => TestBed.configureTestingModule({})); + + it('should be created', () => { + const service: DashboardService = TestBed.get(DashboardService); + expect(service).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/dashboard/dashboard.service.ts b/ng6-seed/src/app/dashboard/dashboard.service.ts new file mode 100644 index 000000000..e87616fad --- /dev/null +++ b/ng6-seed/src/app/dashboard/dashboard.service.ts @@ -0,0 +1,87 @@ +/** Common Import Section */ +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs';//for Datatables +import { HttpClient } from '@angular/common/http'; +import { catchError } from 'rxjs/operators'; +import { of } from 'rxjs'; + +/** Imported Service Files Are., */ +import { AwsService } from '../AwsService/aws.service'; +/** Environment */ +import { environment } from 'environments/environment'; + + +/** Consant Value For Created Date And Updated Date */ +const currentdate = new Date().toJSON().slice(0,19).replace('T',' '); + +@Injectable() + +export class DashboardService { + + private apiUrl = environment.apiEndpoint; + + + constructor(private _http: HttpClient, + private _aws:AwsService) { } + +// $route['getDashBoardMaster'] +// $route['getDashBoardLenderCity'] +// $route['getDashBoardDetailsOfCity'] + +/** +* TO Get the M Datas using API Call +* 1st argument is "TableName" :string - Table Name +*/ +// getAllMasterData(TableName:string): Observable { +// return this._http.post(this.apiUrl+"getListOfMaster", { "master_name":TableName }) +// .pipe( +// catchError(this.handleError('role', [])) +// ) +// } + +/** +* TO get PD Datas For Dashboard Screen +*/ +getPDDetailForDoughnut(): Observable { + return this._http.get(this.apiUrl+'getDashBoardMaster') + .pipe( + catchError(this.handleError('role', [])) + ) + +} + +getLenderDetail(): Observable { + return this._http.get(this.apiUrl+'getDashBoardLenderCity') + .pipe( + catchError(this.handleError('role', [])) + ) + + } + + getCityDetail(): Observable { + return this._http.get(this.apiUrl+'getDashBoardDetailsOfCity') + .pipe( + catchError(this.handleError('role', [])) + ) + + } + + getAlertDetail(): Observable { + return this._http.get(this.apiUrl+'getDashBoardAlertDetails') + .pipe( + catchError(this.handleError('role', [])) + ) + + } + +/** +* TO Handle The Error +*/ +private handleError(operation = 'operation', result?: T) { + + return (error: any): Observable => { + return of(result as T); + }; +} + +} \ No newline at end of file diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts index 0d8ac289a..ad6a4fd3e 100644 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts @@ -54,9 +54,9 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { this.currentUser = this.currentUser.records[0]; this.fullName = this.currentUser.user_first_name +' '+this.currentUser.user_last_name; //console.log(this.currentUser); - if(this.currentUser.fk_entity_id == 1 ){ + if(this.currentUser.fk_entity_type_id == 1 ){ this.userDep = "SineEdge"; - }else if(this.currentUser.fk_entity_id ==2){ + }else if(this.currentUser.fk_entity_type_id ==2){ this.userDep = "Lender"; }else{ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html index a84df2465..d9edf6f0a 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html @@ -104,11 +104,25 @@ +
+ + +
+
+ + Remarks + + +
+
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts index f3af75f2c..0ea3bafc5 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts @@ -72,6 +72,7 @@ export class AddressComponent implements OnInit { this.addressForm.controls.comment_locality.setValue(data.records.comment_locality); this.addressForm.controls.customer_behaviour.setValue(data.records.customer_behaviour); this.addressForm.controls.locality.setValue(data.records.locality); + this.addressForm.controls.address_form_remark.setValue(data.records.address_form_remark); if (data.records.locality_others) { this.addressForm.controls.locality_others.setValue(data.records.locality_others); } @@ -98,7 +99,8 @@ export class AddressComponent implements OnInit { pd_location: ['', Validators.compose([Validators.required])], comment_locality: ['', Validators.compose([Validators.required])], customer_behaviour: ['', Validators.compose([Validators.required])], - neighbourhood: this.fb.array([]) + neighbourhood: this.fb.array([]), + address_form_remark:[''] }); this.address = this.addressForm.controls['address']; this.addressType = this.addressForm.controls['address_type']; @@ -175,6 +177,7 @@ export class AddressComponent implements OnInit { records.comment_locality = this.commentlocality.value; records.customer_behaviour = this.commentlocality.value; records.neighbourhood = this.addressForm.controls.neighbourhood.value; + records.address_form_remark = this.addressForm.controls.address_form_remark.value; records.pdid = this.pdid; records.formid = '5'; // records.fk_createdby = '250'; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html index 108088644..e5baf4036 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -1,4 +1,5 @@ +

Assets Details

@@ -16,6 +17,7 @@ {{ asset.name }} + @@ -206,9 +208,8 @@
- Is there a loan? -
+ Is there a loan? +
@@ -235,13 +236,24 @@
+ + + +
@@ -249,4 +261,6 @@ + + \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts index 204344fbb..03138ffeb 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts @@ -189,7 +189,8 @@ export class AssetsInfoComponent implements OnInit { formid: ['4'], assets_details: this._formBuilder.array([ // this.initDetails(), - ]) + ]), + // assets_form_remark:[value.assets_form_remark || 'check'] }); this.addAssetsDetailsWithData(value.assets_details); } else { @@ -198,7 +199,8 @@ export class AssetsInfoComponent implements OnInit { formid: ['4'], assets_details: this._formBuilder.array([ this.initDetails(), - ]) + ]), + // assets_form_remark:[''] }); } this.loadDetails = true; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html index f2e5b6159..85c710599 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html @@ -62,6 +62,14 @@
+
+
+ + Remarks + + +
+
+ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts index bee15a2f3..c37f8e968 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts @@ -84,6 +84,8 @@ export class FamilyDetailsComponent implements OnInit { this.familyForm.controls.members.setValue(data.records.family_members); this.familyForm.controls.years.setValue(data.records.no_of_years); this.familyForm.controls.ownership.setValue(data.records.ownership); + this.familyForm.controls.family_details_form_remark.setValue(data.records.family_details_form_remark); + if (data.records.ownership_others) { this.familyForm.controls.ownershipOther.setValue(data.records.ownership_others); } @@ -122,7 +124,8 @@ export class FamilyDetailsComponent implements OnInit { ownershipOther: [''], rent: [''], earningMembers: this.fb.array([]), - nonEarningMembers: this.fb.array([]) + nonEarningMembers: this.fb.array([]), + family_details_form_remark: [''] }); this.person = this.familyForm.controls['person']; this.personOther = this.familyForm.controls['personOther']; @@ -212,6 +215,7 @@ export class FamilyDetailsComponent implements OnInit { records.family_members = this.members.value; records.earning_members = this.familyForm.controls['earningMembers'].value; records.non_earning_members = this.familyForm.controls['nonEarningMembers'].value; + records.family_details_form_remark = this.familyForm.controls['family_details_form_remark'].value; records.pdid = this.pdid; records.formid = '6'; // records.fk_createdby = '251'; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html index 92820df86..87b675661 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html @@ -112,6 +112,15 @@ + +
+
+ + Remarks + + +
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts index 9dad2e46c..e4e50d7f4 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts @@ -123,6 +123,7 @@ var co_result = Object.keys(data.co_applicant_details).map(function(key) { form_id:null, mainItem: mainApplicantGroup, coItem: coApplicantGroup, + personal_info_form_remark: [data.personal_info_form_remark] }); //console.log(this._personalForm); this.loadDataStatus = true; @@ -178,6 +179,7 @@ var co_result = Object.keys(data.co_applicant_details).map(function(key) { form_id:null, mainItem: mainApplicantGroup, coItem: coApplicantGroup, + personal_info_form_remark:null }); //console.log(this._personalForm); this.loadDataStatus = true; @@ -236,7 +238,8 @@ submitPersonalForm(formData:any) { "pdid": this.pdid, "formid": this.form_id, "main_applicant_details":main_applicantDetails, - "co_applicant_details":co_applicantDetails + "co_applicant_details":co_applicantDetails, + "personal_info_form_remark": this._personalForm.get('personal_info_form_remark').value }; this._pd.savePDFormDetailsWithID(save_details).subscribe(result => { if (result.status == 200) {