| Mail Status |
diff --git a/ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.ts b/ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.ts
index 3818afe31..5e3ca3c0f 100755
--- a/ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.ts
+++ b/ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.ts
@@ -43,6 +43,7 @@ export class MisReportsComponent implements OnInit {
'officer_name',
'status',
'createdon',
+ 'emp_id',
'mail_status'
];
expandStatus: boolean=true;
@@ -136,7 +137,7 @@ export class MisReportsComponent implements OnInit {
pageChange(e) {
console.log(e);
}
- searchPanel(){
+ searchPanel(){
this.Loading=true;
this.reportform.value.from_date=this.pipe.transform(this.reportform.value.from_date,'yyyy-MM-dd')
this.reportform.value.to_date=this.pipe.transform(this.reportform.value.to_date,'yyyy-MM-dd')
diff --git a/ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.html b/ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.html
new file mode 100644
index 000000000..b1863bd77
--- /dev/null
+++ b/ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.html
@@ -0,0 +1,34 @@
+
+ {{title}}
+
+
+
+ {{question}}
+
+
+
+
+
+ Location
+
+
+
+
+
+
+
+ otp works!
+
diff --git a/ng6-seed/src/app/session/otp/otp.component.scss b/ng6-seed/src/app/session/otp/otp.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/ng6-seed/src/app/session/otp/otp.component.spec.ts b/ng6-seed/src/app/session/otp/otp.component.spec.ts
new file mode 100644
index 000000000..9f338d7c2
--- /dev/null
+++ b/ng6-seed/src/app/session/otp/otp.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { OtpComponent } from './otp.component';
+
+describe('OtpComponent', () => {
+ let component: OtpComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ OtpComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(OtpComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/ng6-seed/src/app/session/otp/otp.component.ts b/ng6-seed/src/app/session/otp/otp.component.ts
new file mode 100644
index 000000000..393a3115b
--- /dev/null
+++ b/ng6-seed/src/app/session/otp/otp.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-otp',
+ templateUrl: './otp.component.html',
+ styleUrls: ['./otp.component.scss']
+})
+export class OtpComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/ng6-seed/src/app/session/session.module.ts b/ng6-seed/src/app/session/session.module.ts
index e5709cde3..0ad2c5dee 100755
--- a/ng6-seed/src/app/session/session.module.ts
+++ b/ng6-seed/src/app/session/session.module.ts
@@ -17,6 +17,7 @@ import { ForgotPasswordComponent } from './forgot-password/forgot-password.compo
import { LockScreenComponent } from './lockscreen/lockscreen.component';
import { SessionRoutes } from './session.routing';
+import { OtpComponent } from './otp/otp.component';
@NgModule({
imports: [
@@ -38,6 +39,7 @@ import { SessionRoutes } from './session.routing';
RegisterComponent,
ForgotPasswordComponent,
LockScreenComponent,
+ OtpComponent,
]
})
diff --git a/ng6-seed/src/app/settings/users/register/register.component.html b/ng6-seed/src/app/settings/users/register/register.component.html
index 802277039..c6e5c4532 100755
--- a/ng6-seed/src/app/settings/users/register/register.component.html
+++ b/ng6-seed/src/app/settings/users/register/register.component.html
@@ -164,7 +164,7 @@
Designation is Required
-
+
@@ -174,7 +174,8 @@
-
+
+
Select
diff --git a/ng6-seed/src/app/settings/users/register/register.component.ts b/ng6-seed/src/app/settings/users/register/register.component.ts
index 1f65cd0ec..5c01337d7 100755
--- a/ng6-seed/src/app/settings/users/register/register.component.ts
+++ b/ng6-seed/src/app/settings/users/register/register.component.ts
@@ -74,6 +74,7 @@ export class RegisterComponent implements OnInit {
configdata: any;
shortname: any;
vendorlist: any;
+ vendor: boolean;
constructor(
private router: Router, public fb: FormBuilder,public cb: FormBuilder, public AWS: AwsService, private cd: ChangeDetectorRef
,private elementRef: ElementRef,public users:UserService,notifier:NotifierService,private dialog: MatDialog) {
@@ -331,6 +332,13 @@ console.log("cog",userData,this.usersData)
this.visible = false;
// alert(this.visible);
}
+ if(e.role_id=='28' ||e.role_id=='29')
+ {
+ this.vendor=true;
+ }
+ else{
+ this.vendor=false;
+ }
// if(e.value){
@@ -396,7 +404,7 @@ getBranch(flag?){
if(this.types[0].entity_type_id == '2' && this.regForm.value.lenVenName.short_name == 'MWISE') {
//this.regForm.addControl('user_config',this.addUserConfigControls())
this.regForm.addControl('designation',new FormControl('',Validators.required))
- this.regForm.addControl('smc_agency_id',new FormControl('',Validators.required))
+ this.regForm.addControl('smc_agency_id',new FormControl(''))
this.getvendor()
this.users.getEntityPreferences(this.regForm.value.lenVenName.entity_id).subscribe(res=>{
if(res['dataStatus']) {
diff --git a/ng6-seed/src/app/video-chat/video-player/video-player.component.html b/ng6-seed/src/app/video-chat/video-player/video-player.component.html
index 87bfedd19..8257a882f 100755
--- a/ng6-seed/src/app/video-chat/video-player/video-player.component.html
+++ b/ng6-seed/src/app/video-chat/video-player/video-player.component.html
@@ -19,7 +19,7 @@
-
+
@@ -45,8 +45,8 @@
{{item.status}}
- |