Committing updated files

Utkarsh Singh
1 parent 72beab83
Showing 10 changed files with 86 additions and 22 deletions
400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj
400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs
400-SOURCECODE/AIAHTML5.API/Controllers/LicenseTermConditionController.cs
400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs
400-SOURCECODE/AIAHTML5.API/Models/Users.cs
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -109,6 +109,7 @@
     <Compile Include="Controllers\AdminAccessController.cs" />
     <Compile Include="Controllers\AuthenticateController.cs" />
     <Compile Include="Controllers\ForgotUserController.cs" />
+    <Compile Include="Controllers\LicenseTermConditionController.cs" />
     <Compile Include="Controllers\ResetPasswordController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
@@ -21,5 +21,8 @@ namespace AIAHTML5.API.Constants
         public const string PASSWORD_UPDATE_FAILED = "Password update failed";
         public const string INVALID_USER = "Invalid UserID";
+
+        public const string LICENSE_TERM_CONDITION_UPDATE_SUCCESS = "License Term Accepted field updated successfully.";
+        public const string LICENSE_TERM_CONDITION_UPDATE_FAILED = "License Term Accepted field update failed.";
     }
 }
 \ No newline at end of file
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using log4net;
+using AIAHTML5.API.Constants;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace AIAHTML5.API.Controllers
+{
+    public class LicenseTermConditionController : ApiController
+    {
+        // GET api/licensetermcondition
+        public IEnumerable<string> Get()
+        {
+            return new string[] { "value1", "value2" };
+        }
+
+        // GET api/licensetermcondition/5
+        public string Get(int id)
+        {
+            return "value";
+        }
+
+        // POST api/licensetermcondition
+        public HttpResponseMessage Post([FromBody]string licenseeAccountNumber)
+        {
+            ILog logger = log4net.LogManager.GetLogger((System.Reflection.MethodBase.GetCurrentMethod().DeclaringType));
+            logger.Debug("inside POST");
+            HttpResponseMessage response = null;
+
+            int result = AIAHTML5.API.Models.Users.UpdateLicenseTerm(licenseeAccountNumber);
+            if (result > 0)
+                response = new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(AIAConstants.LICENSE_TERM_CONDITION_UPDATE_SUCCESS) };
+            else
+                response = new HttpResponseMessage { StatusCode = HttpStatusCode.InternalServerError, Content = new StringContent(AIAConstants.LICENSE_TERM_CONDITION_UPDATE_FAILED) };
+
+            return response;
+        }
+
+
+        // PUT api/licensetermcondition/5
+        public void Put(int id, [FromBody]string value)
+        {
+        }
+
+        // DELETE api/licensetermcondition/5
+        public void Delete(int id)
+        {
+        }
+    }
+}
@@ -576,9 +576,9 @@ namespace AIAHTML5.API.Models
                             lic.LicenseTypeId = Convert.ToInt32(dr[dc]);
                         if (dc.ColumnName == "InstitutionName")
                             lic.InstitutionName = dr[dc].ToString();
-                        if (dc.ColumnName == "Adress1")
+                        if (dc.ColumnName == "Address1")
                             lic.Address1 = dr[dc].ToString();
-                        if (dc.ColumnName == "Adress2")
+                        if (dc.ColumnName == "Address2")
                             lic.Address2 = dr[dc].ToString();
                         if (dc.ColumnName == "CountryId")
                             lic.CountryId = Convert.ToInt32(dr[dc]);
@@ -592,7 +592,7 @@ namespace AIAHTML5.API.Models
                             lic.Phone = dr[dc].ToString();
                         if (dc.ColumnName == "EmailId")
                             lic.EmailId = dr[dc].ToString();
-                        if (dc.ColumnName == "TotalLogin")
+                        if (dc.ColumnName == "TotalLogins")
                             lic.TotalLogins = Convert.ToInt32(dr[dc]);
                         if (dc.ColumnName == "AccountTypeId")
                             lic.AccountTypeId = Convert.ToInt32(dr[dc]);
@@ -614,7 +614,7 @@ namespace AIAHTML5.API.Models
                         }
                         if (dc.ColumnName == "NoOfRenewals")
                             lic.NoOfRenewals = Convert.ToInt32(dr[dc]);
-                        if (dc.ColumnName == "IsTermAccepted")
+                        if (dc.ColumnName == "IsTermsAccepted")
                             lic.IsTermAccepted = Convert.ToBoolean(dr[dc]);
                         if (dc.ColumnName == "ProductId")
                             lic.ProductId = dr[dc].ToString();
@@ -157,14 +157,11 @@ namespace AIAHTML5.API.Models
             }
         }
-        internal static dynamic UpdateLicenseTerm(Newtonsoft.Json.Linq.JObject accNumber) 
+        internal static dynamic UpdateLicenseTerm(string accNumber) 
         {
-            int result = DBModel.UpdateUserPassword(userInfo);
+            int result = DBModel.UpdateLicenseTermStatus(accNumber);
-            if (result != null)
-                return result;
-            else
-                return AIAConstants.USER_NOT_FOUND;
+            return result;
         }
     }
 }
 \ No newline at end of file
@@ -86,6 +86,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $rootScope.isVisibleLogin;
     $rootScope.haveRoleAdmin;
     $rootScope.checked = false;
+    $rootScope.licenseeAccountNumber = null;
     var isfilloptionChecked = "";
     var isOutlineOptionChecked = "";
     $rootScope.forgotPwdModalShow = function ()
@@ -169,6 +170,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                                              $rootScope.userModules = result.Modules;
                                              $rootScope.isVisibleLogin = false;
                                              $rootScope.haveRoleAdmin = true;
+                                             $rootScope.licenseeAccountNumber = result.License.AccountNumber;
                                              localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
                                              $('#dvUserModulesInfo').modal('show');
                                          //}
@@ -193,8 +195,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                                          //}
-                                             if (!result.License.IsTermAccepted) {
-                                                 $('#dvTermCondition').modal('show');
+                                             if (!result.License.IsTermAccepted) {                                                 
+                                                 $('#dvTermCondition').fadeIn();
+                                                 //$('#dvTermCondition').modal('show');
                                              }
                                      }
                                      else {
@@ -254,15 +257,19 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         }
     }
-    function UpdateUserTermAndCondition(accountNumber) {
+    $rootScope.UpdateLicenseTermStatus = function () {
+        $('#dvTermCondition').fadeOut();
+       if($rootScope.licenseeAccountNumber !=null) {
-        AuthenticationService.UpdateTermAndConditionAcceptanceStatus(accountNumber)
+           AuthenticationService.UpdateLicenseTerm($rootScope.licenseeAccountNumber)
                 .then(function (result) {
                     console.log(' Term and Condition acceptance status updated successfully.');
+
                 },
                 function (error) {
-                    console.log(' Error in Term and Condition acceptance status update = ' + error.statusText);
+                    console.log(' Error in Term and Condition acceptance status update = ' + error);//.statusText
                 });
+           }
     };
     function VerifyUrlForQuerystring() {
         var url = $location.url();
@@ -54,10 +54,10 @@
             return deferred.promise;
         },
-        UpdateTermAndConditionAcceptanceStatus: function (accountNumber) {
+        UpdateLicenseTerm: function (licenseeAccountNumber) {
             var deferred = $q.defer();
-            $http.put('/API/api/Authenticate', JSON.stringify(accountNumber), {
+            $http.post('/API/api/LicenseTermCondition', JSON.stringify(licenseeAccountNumber), {
                 headers: {
                     'Content-Type': 'application/json'
                 }
@@ -1302,7 +1302,8 @@
     <div class=" fade ui-draggable in" id="dvTermCondition" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="padding-left: 17px; display: none; left: 0px !important; z-index: 111111; position: fixed; top: 0; overflow-x: hidden; overflow-y: auto; right: 0px; bottom: 0px; ">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
-                <div class="modal-header ui-draggable-handle " style="color: #ffffff; background-color: #0095da; border-color: #007ab3;cursor:default;"><!--color: #e5e5e5;-->                    
+                <div class="modal-header ui-draggable-handle " style="color: #ffffff; background-color: #0095da; border-color: #007ab3;cursor:default;">
+                    <!--color: #e5e5e5;-->
                     <h6 class="text-left lhgt19 padd5" style="color:#fff; text-align:left;">Terms of Service</h6>
                 </div>
@@ -1312,15 +1313,15 @@
                         <form class="form-horizontal">
                             <div class="form-group">
                                 <input type="checkbox" id="chkAccept" ng-model="checked" />I accept
-                                <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#mymodal" ng-disabled="!checked" data-dismiss="modal"><i class="fa fa-check"></i> Next</button>
+                                <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#mymodal" ng-disabled="!checked" data-dismiss="modal" ng-click="UpdateLicenseTermStatus()"><i class="fa fa-check"></i> Next</button>
                             </div>
-                    </form>
+                        </form>
+                    </div>
                 </div>
-            </div>
+            </div>
         </div>
     </div>
-</div>
     <script>
         function enableDisableFillOption() {