fixed deativation datein admin section

Birendra
1 parent 0c054178
Showing 8 changed files with 35 additions and 12 deletions
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserController.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.Context.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.Designer.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.edmx
400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserModel.cs
400-SOURCECODE/Admin/src/app/components/UserEntity/user.service.ts
400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.html
400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts
@@ -205,6 +205,13 @@ namespace AIAHTML5.ADMIN.API.Controllers
             UserEntity.Password = jsonUserData["Password"].Value<string>();
             UserEntity.IsActive = jsonUserData["IsActive"].Value<bool>();
             UserEntity.CreatorId = jsonUserData["Modifiedby"].Value<int>();
+
+            JToken typeToken= jsonUserData["DeactivationDate"];
+            if (typeToken.Type != JTokenType.Null)
+            {
+                UserEntity.DeactivationDate = typeToken.Value<DateTime>();
+            }
+
             try
             {
                 Status = UserModel.UpdateUser(dbContext, UserEntity);
@@ -3425,7 +3425,7 @@ namespace AIAHTML5.ADMIN.API.Entity
             return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("usp_SaveLabExerciseAttempts", userIdParameter, labExerciseIdentifierParameter, lastQuestionParameter, totalQuestionsParameter);
         }
-        public virtual int usp_UpdateAIAUser(string sLoginId, string sPassword, string sFirstname, string sLastname, string sEmailId, Nullable<int> id, Nullable<int> iCreatorId, Nullable<byte> isActive, ObjectParameter status)
+        public virtual int usp_UpdateAIAUser(string sLoginId, string sPassword, string sFirstname, string sLastname, string sEmailId, Nullable<int> id, Nullable<int> iCreatorId, Nullable<byte> isActive, Nullable<System.DateTime> deactivateDate, ObjectParameter status)
         {
             var sLoginIdParameter = sLoginId != null ?
                 new ObjectParameter("sLoginId", sLoginId) :
@@ -3459,7 +3459,11 @@ namespace AIAHTML5.ADMIN.API.Entity
                 new ObjectParameter("isActive", isActive) :
                 new ObjectParameter("isActive", typeof(byte));
-            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("usp_UpdateAIAUser", sLoginIdParameter, sPasswordParameter, sFirstnameParameter, sLastnameParameter, sEmailIdParameter, idParameter, iCreatorIdParameter, isActiveParameter, status);
+            var deactivateDateParameter = deactivateDate.HasValue ?
+                new ObjectParameter("deactivateDate", deactivateDate) :
+                new ObjectParameter("deactivateDate", typeof(System.DateTime));
+    
+            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("usp_UpdateAIAUser", sLoginIdParameter, sPasswordParameter, sFirstnameParameter, sLastnameParameter, sEmailIdParameter, idParameter, iCreatorIdParameter, isActiveParameter, deactivateDateParameter, status);
         }
         public virtual int usp_UpdateblockedUser(Nullable<int> id, ObjectParameter status)
-// T4 code generation is enabled for model 'F:\CB_Develop00-SOURCECODE\AIAHTML5.ADMIN.API\Entity\AIADBEntity.edmx'. 
+// T4 code generation is enabled for model 'E:\AIAProject00-SOURCECODE\AIAHTML5.ADMIN.API\Entity\AIADBEntity.edmx'. 
 // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer
 // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model
 // is open in the designer.
@@ -4,7 +4,7 @@
   <edmx:Runtime>
     <!-- SSDL content -->
     <edmx:StorageModels>
-    <Schema Namespace="AIADatabaseV5Model.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2008" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
+    <Schema Namespace="AIADatabaseV5Model.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2008" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
         <EntityType Name="AccountType">
           <Key>
             <PropertyRef Name="Id" />
@@ -1421,6 +1421,7 @@
           <Parameter Name="id" Type="int" Mode="In" />
           <Parameter Name="iCreatorId" Type="int" Mode="In" />
           <Parameter Name="isActive" Type="tinyint" Mode="In" />
+          <Parameter Name="deactivateDate" Type="datetime" Mode="In" />
           <Parameter Name="Status" Type="int" Mode="InOut" />
         </Function>
         <Function Name="usp_UpdateAiaUserPassword" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
@@ -2539,6 +2540,7 @@
             <Parameter Name="id" Mode="In" Type="Int32" />
             <Parameter Name="iCreatorId" Mode="In" Type="Int32" />
             <Parameter Name="isActive" Mode="In" Type="Byte" />
+            <Parameter Name="deactivateDate" Mode="In" Type="DateTime" />
             <Parameter Name="Status" Mode="InOut" Type="Int32" />
           </FunctionImport>
           <FunctionImport Name="usp_UpdateblockedUser">
@@ -114,7 +114,7 @@ namespace AIAHTML5.ADMIN.API.Models
             short EditionId = (short)UserEntity.EditionId;
             try
             {
-                dbContext.usp_UpdateAIAUser(UserEntity.LoginId, UserEntity.Password, UserEntity.FirstName, UserEntity.LastName,UserEntity.EmailId,UserEntity.Id,UserEntity.CreatorId,(UserEntity.IsActive ? (byte)1 :(byte)0),spStatus);
+                dbContext.usp_UpdateAIAUser(UserEntity.LoginId, UserEntity.Password, UserEntity.FirstName, UserEntity.LastName,UserEntity.EmailId,UserEntity.Id,UserEntity.CreatorId,(UserEntity.IsActive ? (byte)1 :(byte)0),UserEntity.DeactivationDate,spStatus);
                 return spStatus.Value.ToString();
             }
             catch (Exception ex)
@@ -97,7 +97,7 @@ export class UserService {
   UpdateUserEntity(obj: any) {
     //let options = new RequestOptions({ headers: this.headers });
-    var jsonData = { 'id': obj.id, 'FirstName': obj.FirstName, 'LastName': obj.LastName, 'EmailId': obj.EmailId, 'UserName': obj.UserName, 'Password': obj.Password, 'Modifiedby': this.commonService.UserId, 'IsActive': obj.isActive};
+    var jsonData = { 'id': obj.id, 'FirstName': obj.FirstName, 'LastName': obj.LastName, 'EmailId': obj.EmailId, 'UserName': obj.UserName, 'Password': obj.Password, 'Modifiedby': this.commonService.UserId, 'IsActive': obj.isActive,'DeactivationDate': obj.DeactivationDate};
     console.log(obj);
     var headers = new Headers({
       'Content-Type': 'application/json'
@@ -301,8 +301,8 @@
                   <div class="form-group">
                     <label for="inputEmail3" class="col-sm-5 control-label">Deactivation Date  :</label>
                     <div class="col-sm-7">
-                      <input class="form-control input-sm" id="DeactivationDate" placeholder="" type="text" formControlName="DeactivationDate" [attr.disabled]="true">
-
+                      <input class="form-control input-sm" id="DeactivationDate" placeholder="" type="text" formControlName="DeactivationDate">
+                      <!-- <div *ngIf="!adduserFrm.controls.DeactivationDate.valid && adduserFrm.controls.DeactivationDate.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;"></div> -->
                     </div>
                   </div>
                   <div class="row">
@@ -53,6 +53,7 @@ export class UsersList implements OnInit, AfterViewChecked {
   selectedId: number = 0;
   divClass: string;
   isActive: boolean;
+  deaDateblank:boolean;
   NoRecord: string;
   checkedRecords: Array<number>;
   UncheckedRecords: Array<number>;
@@ -101,7 +102,7 @@ export class UsersList implements OnInit, AfterViewChecked {
       ModifiedDate: [''],
       Createdby: [''],
       Modifiedby: [''],
-      DeactivationDate: [''],
+      DeactivationDate: ['',this.noWhitespaceValidator],
       isActive: [false],
       UserStatusActive: ['false'],
       UserStatusInActive:['']
@@ -400,12 +401,21 @@ export class UsersList implements OnInit, AfterViewChecked {
     if (this.adduserFrm.value.FirstName == '') {
       this.alerts += '</br><span>First Name is required.</span>';
     }
-    if (this.adduserFrm.value.LastName == '') {
-      this.alerts += '</br><span>Last Name is required.</span>';
+    this.deaDateblank=false;
+    if (this.adduserFrm.value.DeactivationDate == '' ||this.adduserFrm.value.DeactivationDate == null) {
+      this.deaDateblank=true;
+      //set date to pass from validation and later remove
+      this.adduserFrm.controls['DeactivationDate'].setValue('01/01/2020');
     }
+    
     if (this.adduserFrm.valid && this.alerts == '') {
-      this.adduserFrm.controls['isActive'].setValue(this.adduserFrm.value.UserStatusActive) 
+      this.adduserFrm.controls['isActive'].setValue(this.adduserFrm.value.UserStatusActive) ;
+
+      if(this.deaDateblank)
+      {
+        this.adduserFrm.controls['DeactivationDate'].setValue(null);
+      }
       var Userobj = this.adduserFrm.value;