new screen done for dvr

src/app/createentry/dvrentry.component.html

@@ -82,6 +82,8 @@
 
 
 
+
+
                     <div class="col-lg-4">
                       <div class="form-group" [ngClass]="displayFieldCss('custName')">
                         <label style="font-size: 16px;margin-top: 5px;margin-bottom: 0px;"> Customer<span
@@ -130,21 +132,38 @@
                     </div>
 
 
-                    <div class="col-lg-4" style="margin-top:38px">
-                      <span style="color:#7f7f7f;">Physical Meeting?<span style="color: red;"> *</span>
-                      </span>
-                      <div class="input-group" style="margin-top: 10px;">
+                    <div class="col-lg-4" style="margin-top:38px;">
+                      <div class="form-group" *ngIf="currentSecondContact ==false" style="margin-bottom:2px"
+                        [ngClass]="displayFieldCss('secondContact')">
+                        <label style="font-size: 16px;margin-top: 5px;margin-bottom: 0px;"> Second Contact</label>
 
-                        <div class="switch-field">
-                          <input type="radio" id="radio-one1" name="switch-one1" value="yes" formControlName="ph_meet"
-                            checked />
-                          <label for="radio-one1">Yes</label>
-                          <input type="radio" id="radio-two1" name="switch-one1" value="no" formControlName="ph_meet" />
-                          <label for="radio-two1">No</label>
-                        </div>
+                        <select id="Axis" (change)="contactDetails(contactEntryForm)" class="form-control"
+                          formControlName='secondContact' style="margin-top: 0px;">
+                          <option><a href="" (click)="contactDetails(contactEntryForm)"
+                              style="cursor: pointer;color: #7f7f7f;"> Add New Contact</a></option>
+                          <option *ngIf="second_contact" default disabled>{{second_contact}}</option>
+                          <option *ngFor="let second_contact of contact_data" [ngValue]="second_contact">
+                            {{ second_contact.first_name }} {{ second_contact.last_name }}
+                          </option>
+                        </select>
+                      </div>
+                      <div class="form-group" *ngIf="currentSecondContact ==true" style="margin-bottom:2px"
+                        [ngClass]="displayFieldCss('secondContact')">
+                        <label style="font-size: 16px;margin-top: 5px;margin-bottom: 0px;"> Second Contact</label>
+
+                        <select id="Axis" (change)="contactDetails(contactEntryForm)" class="form-control"
+                          formControlName='secondContact' style="margin-top: 0px;">
+                          <option><a href="" (click)="contactDetails(contactEntryForm)"
+                              style="cursor: pointer;color: #7f7f7f;"> Add New Contact</a></option>
+                          <option *ngIf="second_contact" default disabled>{{second_contact}}</option>
+                          <option *ngFor="let second_contact of secondContact_Details" [ngValue]="second_contact">
+                            {{ second_contact.first_name }} {{ second_contact.last_name }}
+                          </option>
+                        </select>
                       </div>
                     </div>
 
+
                     <div class="col-lg-4" style="margin-top:38px">
 
                       <div class="form-group" style="margin-bottom:2px" [ngClass]="displayFieldCss('stageName')">
@@ -188,34 +207,90 @@
                         <textarea type="text" name="First Name" formControlName="message" class="textarea" id="user"
                           onkeyup="this.setAttribute('value', this.value);" value=""
                           style="margin: 25px 0;padding: 14px;height:auto !important;border-bottom: 2px solid #e0e0e0 !important;margin-top: -2px;padding: 0px;"></textarea>
-                        <app-field-error-display [displayError]="isFieldValid('message')" errorMsg="Please enter Message">
+                        <app-field-error-display [displayError]="isFieldValid('message')"
+                          errorMsg="Please enter Message">
                         </app-field-error-display>
                       </div>
                     </div>
-                  
-
-
-                  <div class="col-lg-4" style="margin-top:38px;">
-                    <div class="form-group" style="margin-bottom:2px" [ngClass]="displayFieldCss('secondContact')">
-                      <label style="font-size: 16px;margin-top: 5px;margin-bottom: 0px;"> Second Contact<span
-                          style="color: red;"> *</span></label>
-  
-                      <select id="Axis" (change)="contactDetails(contactEntryForm)" class="form-control"
-                        formControlName='secondContact' style="margin-top: 0px;">
-                        <option><a href="" (click)="contactDetails(contactEntryForm)"
-                            style="cursor: pointer;color: #7f7f7f;"> Add New Contact</a></option>
-                        <option *ngIf="second_contact" default disabled>{{second_contact}}</option>
-                        <option *ngFor="let second_contact of contact_data" [ngValue]="second_contact">
-                          {{ second_contact.first_name }} {{ second_contact.last_name }}
-                        </option>
-                      </select>
+
+
+
+                    <div class="col-lg-4" style="margin-top:38px">
+                      <span style="color:#7f7f7f;">Physical Meeting?<span style="color: red;"> *</span>
+                      </span>
+                      <div class="input-group" style="margin-top: 10px;">
+
+                        <div class="switch-field">
+                          <input type="radio" id="radio-one1" name="switch-one1" value="yes" formControlName="ph_meet"
+                            checked />
+                          <label for="radio-one1">Yes</label>
+                          <input type="radio" id="radio-two1" name="switch-one1" value="no" formControlName="ph_meet" />
+                          <label for="radio-two1">No</label>
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="col-lg-4" style="margin-top:38px;">
+                      <div class="form-group" [ngClass]="displayFieldCss('date')">
+                        <label style="font-size: 16px;margin-top: 5px;margin-bottom: 0px;">Estimate Date Of Closure Of
+                          Deal</label>
+
+                        <input type="date" class="form-control" formControlName="estDate" name="Date" id="Date"
+                          placeholder="Estimate date of closure of deal" style="margin-top: 0px;">
+                      </div>
+                    </div>
+
+
+
+                    <div class="col-lg-4" style="margin-top:38px;">
+                      <div class="form-group" [ngClass]="displayFieldCss('objective')">
+                        <label style="font-size: 16px;margin-top: 5px;margin-bottom: 0px;">Objective/Opportunity</label>
+                        <textarea type="text" name="objective" formControlName="objective" class="textarea"
+                          id="objective" onkeyup="this.setAttribute('value', this.value);" value=""
+                          style="margin: 25px 0;padding: 14px;height:auto !important;border-bottom: 2px solid #e0e0e0 !important;margin-top: -2px;padding: 0px;"></textarea>
+
+                      </div>
                     </div>
+
+                    <div class="col-lg-4" style="margin-top:38px;">
+                      <div class="form-group" [ngClass]="displayFieldCss('objective')">
+                        <label style="font-size: 16px;margin-top: 5px;margin-bottom: 0px;">Estimated Value Of Deal
+                        </label>
+                        <textarea type="text" name="deal" formControlName="deal" class="textarea" id="deal"
+                          onkeyup="this.setAttribute('value', this.value);" value=""
+                          (keypress)="allowOnlyNumber($event)"
+                          style="margin: 25px 0;padding: 14px;height:auto !important;border-bottom: 2px solid #e0e0e0 !important;margin-top: -2px;padding: 0px;"></textarea>
+
+                      </div>
+                    </div>
+
+                    <div class="col-lg-4" style="margin-top:38px;">
+                      <div class="form-group">
+                        <label style="font-size: 16px; margin-top: 5px; margin-bottom: 5px;"> Next Action On:</label>
+                        <select id="function" class="form-control" formControlName="postion" (change)="funcPersonDetails(contactEntryForm)"
+                          style="margin: 6px;margin-top: 0px;">
+                          <option value="" disabled selected>Choose Function</option>
+                          <option *ngIf="postion" default disabled>{{postion}}</option>
+                          <option *ngFor="let postion of funcDetails" [ngValue]="postion">
+                            {{ postion.func_name }}
+                          </option>
+                        </select>
+                        <select id="function" class="form-control" formControlName="personData"
+                          style="margin: 6px;margin-top: 0px;">
+                          <option value="" disabled selected>Choose Person</option>
+                          <option *ngIf="person" default disabled>{{person}}</option>
+                          <option *ngFor="let person of personDetails" [ngValue]="person">
+                            {{ person.person_name }}
+                          </option>
+                        </select>
+
+                      </div>
+                    </div>
+
                   </div>
 
                 </div>
 
-                </div>
-                
 
 
               </div>
@@ -299,7 +374,7 @@
         padding: 10px;
         border-radius: 5px;overflow: auto;">
           <!-- <table id="datatableexample" class="display" cellspacing="0" width="100%"> -->
-          <table datatable [dtOptions]="dtOptions" [dtTrigger]="dtTrigger" class="row-border hover" cellspacing="0"
+          <table datatable [dtOptions]="dtOptions" [dtTrigger]="dtTrigger" class="row-border hover table" cellspacing="0"
             width="100%">
 
             <thead>
@@ -309,10 +384,16 @@
                 <th>Customer Name</th>
                 <th>Contact Name</th>
                 <th>Second Contact</th>
-                <th>Next Action</th>
+                <th >Next Action</th>
                 <th>Physical Meeting</th>
-                <th>Message</th>
+                <th >Message</th>
                 <th>Status</th>
+                <th>Estimate Date Of Closure Of Deal</th>
+                <th>Objective/Opportunity</th>
+                <th>Estimated Value Of Deal</th>
+                <th>Function</th>
+                <th>Person</th>
+
 
 
               </tr>
@@ -324,11 +405,30 @@
                 <td>{{current.customer_name }}</td>
                 <td>{{current.contact_name }}</td>
                 <td>{{current.second_contact }}</td>
-                <td>{{current.nextstep }}</td>
+                <td style="    width: 85%;
+             
+                min-height: 150px !important;
+              
+                display: block;
+                overflow-x: auto;">{{current.nextstep }}</td>
                 <td>{{current.physical_meeting | titlecase}}</td>
-                <td>{{current.message }}</td>
+                <td style="    width: auto;
+             
+                min-height: 150px !important;
+              
+                display: block;
+                overflow-x: auto;">{{current.message }}</td>
                 <td>{{current.stage_desc }}</td>
-
+                <td>{{current.est_Date | datePipe}}</td>
+                <td style="    width: auto;
+             
+                min-height: 150px !important;
+              
+                display: block;
+                overflow-x: auto;">{{current.objective}}</td>
+                <td>{{current.estvalue}}</td>
+                <td>{{current.func}}</td>
+                <td>{{current.person}}</td>
 
               </tr>
             </tbody>

src/app/createentry/dvrentry.component.ts

@@ -14,6 +14,12 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
   styleUrls: ['./dvrentry.component.css']
 })
 export class DvrEntryComponent implements OnInit, OnDestroy {
+  allowOnlyNumber(event: KeyboardEvent) {
+    const charCode = event.charCode;
+    if (charCode < 48 || charCode > 57) {
+      event.preventDefault();
+    }
+  }
   public contactEntryForm !: FormGroup;
   public xmlItems: any;
 
@@ -23,9 +29,11 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
   last_login_date: any;
   cust_data: any = [];
   contact_data: any = [];
+  secondContact_Details: any = [];
   stage_data: any = [];
   currentDateData: any = [];
   currentDateData_flag: boolean = false;
+  currentSecondContact: boolean = false;
   cust_name: any;
   messages: any;
   cust_id: any;
@@ -51,8 +59,14 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
   dvr_id: any;
   role: any;
   check_date: any;
-
+  est_Date: any;
+  objective: any;
+  deal: any;
   nextstep: any;
+  postion: any;
+  person: any;
+  funcDetails: any = [];
+  personDetails: any = [];
 
   checkupdatedelete: boolean;
   saveautoData = [];
@@ -106,13 +120,25 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
         this.check_date = response.data[0].created_on;
         this.nextstep = response.data[0].nextstep;
         this.second_contact = response.data[0].second_contact;
+        this.est_Date = response.data[0].est_Date;
+        this.objective = response.data[0].objective;
+        this.deal = response.data[0].deal;
+        this.postion = response.data[0].func;
+        this.person = response.data[0].person;
+        console.log("functinon::::::::::::::::::", this.contact_name)
+
+
         //this.visit_date = datePipetransform(this.visit_date.now(),'dd/MM/yyyy');
         this.visit_date = this.formatDate(this.visit_date);
         this.check_date = this.formatDate(this.check_date);
+        this.est_Date = this.formatDate(this.est_Date);
+
 
         this.visit_date = String(this.visit_date)
         console.log(" this.visit_date", this.visit_date, this.customer_name, this.contact_name, this.stage_des);
         console.log("in updatation");
+        this.est_Date = String(this.est_Date)
+
 
         this.contactEntryForm = new FormGroup({
           date: new FormControl(this.visit_date, Validators.required),
@@ -122,7 +148,15 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
           stageName: new FormControl(this.stage_des, Validators.required),
           ph_meet: new FormControl('yes', Validators.required),
           nextstep: new FormControl(this.nextstep, Validators.required),
-          secondContact: new FormControl(this.second_contact, Validators.required)
+          secondContact: new FormControl(this.second_contact, Validators.required),
+          estDate: new FormControl(this.est_Date, Validators.required),
+          objective: new FormControl(this.objective, Validators.required),
+          deal: new FormControl(this.deal, Validators.required),
+          postion: new FormControl(this.postion, Validators.required),
+          personData: new FormControl(this.person, Validators.required),
+
+
+
 
 
         });
@@ -171,8 +205,12 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
         stageName: new FormControl(null, Validators.required),
         ph_meet: new FormControl('yes', Validators.required),
         nextstep: new FormControl(null, Validators.required),
-        secondContact: new FormControl(null, Validators.required)
-
+        secondContact: new FormControl(null, Validators.required),
+        estDate: new FormControl(null, Validators.required),
+        objective: new FormControl(null, Validators.required),
+        deal: new FormControl(null, Validators.required),
+        postion: new FormControl(null, Validators.required),
+        personData: new FormControl(null, Validators.required),
 
       });
 
@@ -250,7 +288,8 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
         this.contact_data = response.data[1].contactData;
         console.log(" this.contact_data ", this.contact_data);
         this.stage_data = response.data[2].stageData;
-
+        this.personDetails = response.data[3].personData;
+        this.funcDetails = response.data[4].funcDetails;
 
       }
     });
@@ -323,7 +362,11 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
         stageName: new FormControl(this.stage_des, Validators.required),
         nextstep: new FormControl(this.autofillData["nextstep"], Validators.required),
         secondContact: new FormControl(this.second_contact, Validators.required),
-
+        estDate: new FormControl(this.autofillData["estDate"], Validators.required),
+        objective: new FormControl(this.autofillData["objective"], Validators.required),
+        deal: new FormControl(this.autofillData["deal"], Validators.required),
+        postion: new FormControl(this.postion, Validators.required),
+        personData: new FormControl(this.person, Validators.required),
 
       });
     }
@@ -363,7 +406,11 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
         ph_meet: new FormControl(this.autofillData["ph_meet"], Validators.required),
         nextstep: new FormControl(this.autofillData["nextstep"], Validators.required),
         secondContact: new FormControl(this.second_contact, Validators.required),
-
+        estDate: new FormControl(this.autofillData["estDate"], Validators.required),
+        objective: new FormControl(this.autofillData["objective"], Validators.required),
+        deal: new FormControl(this.autofillData["deal"], Validators.required),
+        postion: new FormControl(this.autofillData["postion"], Validators.required),
+        personData: new FormControl(this.person, Validators.required),
 
       });
     }
@@ -378,6 +425,12 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
 
   ngOnchanges() {
     console.log("form.value.message", this.contactEntryForm);
+    this.secondContactDetails(this.contactEntryForm)
+  }
+
+  ngDoCheck() {
+    console.log("form.value.message", this.contactEntryForm);
+    this.secondContactDetails(this.contactEntryForm)
   }
 
   openPopup() {
@@ -434,11 +487,16 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
         stage_id: this.stage_id,
         updated_by: this.login_id,
         nextstep: form.value.nextstep,
-        second_contact: this.second_contact
+        second_contact: this.second_contact != null ? this.second_contact : '',
+        estDate: form.value.estDate,
+        objective: form.value.objective,
+        deal: form.value.deal,
+        postion: form.value.postion,
+        person: form.value.personData,
 
       }
 
-      console.log("createdvr", createdvr);
+      console.log("createdvr111", createdvr);
 
       this.commonservice.updateData(this.commonservice.projectpath + "/updateDvrEntry", createdvr).subscribe(response => {
         this.status_msg = "";
@@ -481,7 +539,7 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
       //in insert
       var createdvr;
       console.log("this.stage_id", this.stage_id);
-      console.log("this.second_contact",this.second_contact,form.value.secondContact);
+      console.log("this.second_contact", this.second_contact, form.value.secondContact);
 
       if (this.stage_id == undefined) {
 
@@ -495,7 +553,12 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
           stage_id: (form.value.stageName ? form.value.stageName.stage_id : ''),
           created_by: this.login_id,
           nextstep: form.value.nextstep,
-          second_contact: (this.second_contact == undefined ? form.value.secondContact.first_name + ' ' + form.value.secondContact.last_name : this.second_contact),
+          second_contact: (form.value.secondContact == null ? '' : form.value.secondContact.first_name + form.value.secondContact.last_name),
+          estDate: form.value.estDate,
+          objective: form.value.objective,
+          deal: form.value.deal,
+          func: form.value.postion.func_name,
+          person: form.value.personData.person_name,
 
 
         }
@@ -511,7 +574,13 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
           stage_id: this.stage_id,
           created_by: this.login_id,
           nextstep: form.value.nextstep,
-          second_contact: (this.second_contact == undefined ? form.value.secondContact.first_name + form.value.secondContact.last_name : this.second_contact),
+          second_contact: (form.value.secondContact == null ? '' : form.value.secondContact.first_name + form.value.secondContact.last_name),
+          estDate: form.value.estDate,
+          objective: form.value.objective,
+          deal: form.value.deal,
+          func: form.value.postion.func_name,
+          person: form.value.personData.person_name,
+
 
 
         }
@@ -519,6 +588,7 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
 
 
       console.log("createdvr in insert", createdvr);
+      console.log("estDate", form.value.estDate);
       console.log("yyyyyyyy", this.customer_name, form.value.custName, this.stage_id, form.value.stageName, this.username);
       this.commonservice.getData(this.commonservice.projectpath + "/createDvrEntry", createdvr).subscribe(response => {
         this.status_msg = "";
@@ -547,6 +617,8 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
             this.contact_name = "";
             this.stage_id = "";
             this.stage_des = "";
+            this.postion = "";
+            this.person = "";
             this.second_contact = "";
             localStorage.removeItem("autofilldata")
             this.contactEntryForm = new FormGroup({
@@ -557,7 +629,16 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
               stageName: new FormControl(null, Validators.required),
               ph_meet: new FormControl('yes', Validators.required),
               nextstep: new FormControl(null, Validators.required),
-              secondContact: new FormControl(null, Validators.required)
+              secondContact: new FormControl(null, Validators.required),
+              estDate: new FormControl(null, Validators.required),
+              objective: new FormControl(null, Validators.required),
+              deal: new FormControl(null, Validators.required),
+              postion: new FormControl(null, Validators.required),
+              personData: new FormControl(null, Validators.required),
+
+
+
+
             });
             // console.log("response.data.message", response.data[0].exception.errorid);
             if (response.data[0].exception.errorid != '') {
@@ -609,6 +690,8 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
     this.stage_id = "";
     this.stage_des = "";
     this.second_contact = "";
+    this.postion = "";
+    this.person = "";
     this.contactEntryForm = new FormGroup({
       date: new FormControl(null, Validators.required),
       message: new FormControl(null, Validators.required),
@@ -617,7 +700,16 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
       stageName: new FormControl(null, Validators.required),
       ph_meet: new FormControl('yes', Validators.required),
       nextstep: new FormControl(null, Validators.required),
-      secondContact: new FormControl(null, Validators.required)
+      secondContact: new FormControl(null, Validators.required),
+      estDate: new FormControl(null, Validators.required),
+      objective: new FormControl(null, Validators.required),
+      deal: new FormControl(null, Validators.required),
+      postion: new FormControl(null, Validators.required),
+      personData: new FormControl(null, Validators.required),
+
+
+
+
     });
   }
 
@@ -785,9 +877,9 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
           this.contact_name = "";
           this.stage_id = "";
           this.stage_des = "";
+          this.postion = "";
+          this.person = "";
           localStorage.removeItem("contactlastinsert")
-
-
           localStorage.removeItem("autofilldata")
           this.contactEntryForm = new FormGroup({
             date: new FormControl(null, Validators.required),
@@ -797,7 +889,16 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
             stageName: new FormControl(null, Validators.required),
             ph_meet: new FormControl('yes', Validators.required),
             nextstep: new FormControl(null, Validators.required),
-            secondContact: new FormControl(null, Validators.required)
+            secondContact: new FormControl(null, Validators.required),
+            estDate: new FormControl(null, Validators.required),
+            objective: new FormControl(null, Validators.required),
+            deal: new FormControl(null, Validators.required),
+            postion: new FormControl(null, Validators.required),
+            personData: new FormControl(null, Validators.required),
+
+
+
+
           });
           //this.router.navigate(['/home'])
           // console.log("response.data.message", response.data[0].exception.errorid);
@@ -813,4 +914,46 @@ export class DvrEntryComponent implements OnInit, OnDestroy {
 
   }
 
+  secondContactDetails(form: FormGroup) {
+    // console.log("form value", form.value);
+    if (form.value.contactName != null) {
+      console.log("first contact is present")
+      console.log("email", form.value.contactName.email_id)
+      if (form.value.contactName.email_id != null) {
+        this.secondContact_Details = this.contact_data.filter((item: { email_id: any; }) => item.email_id != form.value.contactName.email_id)
+        console.log("contact dataqqqqqqqqqqqqqqqqqqq", this.contact_data)
+        this.currentSecondContact = true;
+
+      } else {
+        this.currentSecondContact = false;
+      }
+
+    } else {
+      console.log("first contact is not present")
+    }
+
+
+  }
+
+  funcPersonDetails(form: FormGroup) {
+    console.log("form value", form.value);
+    if (form.value.postion != null) {
+      console.log("postion", form.value.postion)
+      this.commonservice.getAllData(this.commonservice.projectpath + "/mappingFuncIDToPersonNames?func_id=" + form.value.postion.func_id).subscribe(response => {
+        if (response.status == 'falsetoken') {
+          this.router.navigate(['/login'])
+        } else {
+          console.log("response:::::::::::::::::::::::::::::::::::::::::::::::::", response.data)
+          this.personDetails = response.data;
+          console.log("personDetails------------>", this.personDetails);
+        }
+      });
+
+    } else {
+      console.log(" func_id is not present")
+    }
+
+
+  }
+
 }

src/app/home/home.component.html

@@ -36,7 +36,7 @@
   <div id="content" class="p-4 p-md-5 pt-5">
 
     <!-- admin div -->
-    <div class="col-lg-12  panelcss"  style="padding-right:10px;padding-left:10px">
+    <div class="col-lg-12  panelcss" style="padding-right:10px;padding-left:10px">
       <div class="col-lg-12 row mobilepadding">
         <div class="smm smm1">
           <div class="w3-black pull-left">
@@ -51,10 +51,10 @@
             <div class="col-lg-3" style="margin-bottom:6px;margin-bottom:6px">
 
 
-              <select id='saleperson' (change)="salepersonDetails(sale_person)" name='saleperson' [(ngModel)]="sale_person"
-                class="form-control" placeholder="Sales Person">
+              <select id='saleperson' (change)="salepersonDetails(sale_person)" name='saleperson'
+                [(ngModel)]="sale_person" class="form-control" placeholder="Sales Person">
 
-                <option class="dropdown-item"  selected value="undefined">Sales Person</option>
+                <option class="dropdown-item" selected value="undefined">Sales Person</option>
 
                 <option *ngFor="let item of datalist?.[0]" [value]="item.first_name+ ' '+item.last_name">
                   {{item.first_name}} {{item.last_name}}
@@ -67,8 +67,7 @@
             <div class="col-lg-3" style="margin-bottom:6px;margin-bottom:6px">
 
 
-              <select id="customer"  name='customer' class="form-control" [(ngModel)]="customer"
-                placeholder="Customer">
+              <select id="customer" name='customer' class="form-control" [(ngModel)]="customer" placeholder="Customer">
                 <option class="dropdown-item" selected value="undefined">Customers</option>
 
                 <option *ngFor="let cust of cust_data" [ngValue]="cust">
@@ -82,7 +81,8 @@
 
             <div class="col-lg-3" style="display:flex;margin-bottom:6px">
               <label for="startDate" style="font-size: medium;margin-right: 10px;font-weight:lighter;">From:</label>
-              <input type="date" id="startDate" name="startDate" [(ngModel)]="startDate" style="border-radius: 4px;border: 1px solid hsl(214, 7%, 81%);height: 40px;font-size: 13px;padding: 10px;">
+              <input type="date" id="startDate" name="startDate" [(ngModel)]="startDate"
+                style="border-radius: 4px;border: 1px solid hsl(214, 7%, 81%);height: 40px;font-size: 13px;padding: 10px;">
             </div>
             <div class="col-lg-3" style="display:flex;margin-bottom:6px">
               <label for="endDate"
@@ -412,18 +412,27 @@
       padding: 10px;
       border-radius: 5px;overflow: auto;">
         <div *ngIf="dvrList">
-          <table datatable [dtOptions]="dtOptions" [dtTrigger]="dtTrigger" class="dataTable row-border hover display"
+          <table datatable [dtOptions]="dtOptions" [dtTrigger]="dtTrigger" class="table dataTable row-border hover display"
             cellspacing="0" width="100%" style="border: 1px solid #ccc">
             <thead>
               <tr>
 
                 <th style="width:15%">Customer Name</th>
                 <th style="width:15%">Contact Name</th>
+                <th style="width:15%">Second Contact</th>
+                <th style="width:15%">Next Action</th>
                 <th style="width:15%">Date of Visit</th>
                 <th style="width:15%">Physical Meeting</th>
                 <th style="width:15%">Sales Person</th>
+                <th style="width:40%;">Message</th>
+                <th style="width:40%;">Status</th>
+                <th style="width:15%">Estimate Date Of Closure Of Deal</th>
+                <th style="width:40%;">Objective/Opportunity</th>
+                <th style="width:15%">Estimated Value Of Deal</th>
+                <th style="width:15%">Function</th>
+                <th style="width:15%">Person</th>
+
 
-                <th style="width:40%;overflow:scroll">Message</th>
 
               </tr>
             </thead>
@@ -432,15 +441,38 @@
                 <!-- <td><a routerLink="/dvrentry/id:"+{{dvrData.customer_name}}+>{{dvrData.customer_name}}</a></td> -->
                 <td> <a routerLink="/dvrentry/id:{{dvrData.dvr_id}}"> {{dvrData.customer_name}}</a></td>
                 <td>{{dvrData.contact_name}}</td>
+                <td >{{dvrData.second_contact}}</td>
+                <td style="    width: 85%;
+             
+                min-height: 150px !important;
+              
+                display: block;
+                overflow-x: auto;">{{dvrData.nextstep}}</td>
                 <td>{{dvrData.date_of_visit | datePipe}}</td>
                 <td>{{dvrData.physical_meeting | titlecase}}</td>
                 <td>{{dvrData.sale_person}}</td>
+                <td style="    width: auto;
+             
+                min-height: 150px !important;
+              
+                display: block;
+                overflow-x: auto;">{{dvrData.message}}</td>
+                <td>{{dvrData.stage_desc }}</td>
+                <td>{{dvrData.est_Date | datePipe}}</td>
+                <td  style="    width: auto;
+             
+                min-height: 150px !important;
+              
+                display: block;
+                overflow-x: auto;">{{dvrData.objective}}</td>
+                <td >{{dvrData.estvalue}}</td>
+                <td>{{dvrData.func }}</td>
+                <td>{{dvrData.person }}</td>
 
-                <td class="message-height">{{dvrData.message}}</td>
               </tr>
             </tbody>
           </table>
-
+ 
         </div>
       </div>
     </div>
@@ -488,4 +520,5 @@
     overflow-y: auto;
     border: none;
   }
+
 </style>