batch upload for template download -- frank

atms-dao/src/main/java/pwc/taxtech/atms/organization/mapper/OrganizationDirectorTMapper.java

@@ -11,13 +11,13 @@ import pwc.taxtech.atms.organization.entity.OrganizationDirector;
 public interface OrganizationDirectorTMapper {
     OrganizationDirectorTMapper ORGANIZATION_DIRECTOR_T_MAPPER = Mappers.getMapper(OrganizationDirectorTMapper.class);
 
-    @Mapping(source = "dateOfAppointment", target = "dateOfAppointment", dateFormat = "yyyy/MM/dd")
-    @Mapping(source = "dateOfResignation", target = "dateOfResignation", dateFormat = "yyyy/MM/dd")
+    @Mapping(source = "dateOfAppointment", target = "dateOfAppointment", dateFormat = "MM/dd/yyyy")
+    @Mapping(source = "dateOfResignation", target = "dateOfResignation", dateFormat = "MM/dd/yyyy")
     OrganizationDirectorDto toOrganizationDirectorDto(OrganizationDirector organizationDirector);
 
     OrgDirectorDto toOrgDirectorDto(OrganizationDirector organizationDirector);
 
-    @Mapping(source = "dateOfAppointment", target = "dateOfAppointment", dateFormat = "yyyy/MM/dd")
-    @Mapping(source = "dateOfResignation", target = "dateOfResignation", dateFormat = "yyyy/MM/dd")
+    @Mapping(source = "dateOfAppointment", target = "dateOfAppointment", dateFormat = "MM/dd/yyyy")
+    @Mapping(source = "dateOfResignation", target = "dateOfResignation", dateFormat = "MM/dd/yyyy")
     OrganizationDirector toOrganizationDirector(OrganizationDirectorDto organizationDirectorDto);
 }

atms-dao/src/main/java/pwc/taxtech/atms/organization/mapper/OrganizationHKTMapper.java

@@ -11,23 +11,23 @@ import pwc.taxtech.atms.organization.entity.OrganizationHK;
 public interface OrganizationHKTMapper {
     OrganizationHKTMapper ORGANIZATION_HK_MAPPER = Mappers.getMapper(OrganizationHKTMapper.class);
 
-    @Mapping(source = "createTime", target = "createTime", dateFormat = "yyyy/MM/dd")
-    @Mapping(source = "updateTime", target = "updateTime", dateFormat = "yyyy/MM/dd")
-    @Mapping(source = "dateOfIncorporation", target = "dateOfIncorporation", dateFormat = "yyyy/MM/dd")
-    @Mapping(source = "paymentOfAnnualGovernmentFee", target = "paymentOfAnnualGovernmentFee", dateFormat = "yyyy/MM/dd")
-    @Mapping(source = "annualReturnFillings", target = "annualReturnFillings", dateFormat = "yyyy/MM/dd")
-    @Mapping(source = "renewalOfBusinessLicense", target = "renewalOfBusinessLicense", dateFormat = "yyyy/MM/dd")
-    @Mapping(source = "annualAuditRequirement", target = "annualAuditRequirement", dateFormat = "yyyy/MM/dd")
+    @Mapping(source = "createTime", target = "createTime", dateFormat = "MM/dd/yyyy")
+    @Mapping(source = "updateTime", target = "updateTime", dateFormat = "MM/dd/yyyy")
+    @Mapping(source = "dateOfIncorporation", target = "dateOfIncorporation", dateFormat = "MM/dd/yyyy")
+    @Mapping(source = "paymentOfAnnualGovernmentFee", target = "paymentOfAnnualGovernmentFee", dateFormat = "MM/dd/yyyy")
+    @Mapping(source = "annualReturnFillings", target = "annualReturnFillings", dateFormat = "MM/dd/yyyy")
+    @Mapping(source = "renewalOfBusinessLicense", target = "renewalOfBusinessLicense", dateFormat = "MM/dd/yyyy")
+    @Mapping(source = "annualAuditRequirement", target = "annualAuditRequirement", dateFormat = "MM/dd/yyyy")
     OrganizationHKDto toOrganizationHKDto(OrganizationHK organizationHK);
 
     OrgInfoDto toOrgInfoDto(OrganizationHK organizationHK);
 
-    @Mapping(source = "createTime", target = "createTime", dateFormat = "yyyy/MM/dd")
-    @Mapping(source = "updateTime", target = "updateTime", dateFormat = "yyyy/MM/dd")
-    @Mapping(source = "dateOfIncorporation", target = "dateOfIncorporation", dateFormat = "yyyy/MM/dd")
-    @Mapping(source = "paymentOfAnnualGovernmentFee", target = "paymentOfAnnualGovernmentFee", dateFormat = "yyyy/MM/dd")
-    @Mapping(source = "annualReturnFillings", target = "annualReturnFillings", dateFormat = "yyyy/MM/dd")
-    @Mapping(source = "renewalOfBusinessLicense", target = "renewalOfBusinessLicense", dateFormat = "yyyy/MM/dd")
-    @Mapping(source = "annualAuditRequirement", target = "annualAuditRequirement", dateFormat = "yyyy/MM/dd")
+    @Mapping(source = "createTime", target = "createTime", dateFormat = "MM/dd/yyyy" , defaultValue = "01/01/1900")
+    @Mapping(source = "updateTime", target = "updateTime", dateFormat = "MM/dd/yyyy" , defaultValue = "01/01/1900")
+    @Mapping(source = "dateOfIncorporation", target = "dateOfIncorporation", dateFormat = "MM/dd/yyyy", defaultValue = "01/01/1900")
+    @Mapping(source = "paymentOfAnnualGovernmentFee", target = "paymentOfAnnualGovernmentFee", dateFormat = "MM/dd/yyyy" , defaultValue = "01/01/1900")
+    @Mapping(source = "annualReturnFillings", target = "annualReturnFillings", dateFormat = "MM/dd/yyyy" , defaultValue = "01/01/1900")
+    @Mapping(source = "renewalOfBusinessLicense", target = "renewalOfBusinessLicense", dateFormat = "MM/dd/yyyy" , defaultValue = "01/01/1900")
+    @Mapping(source = "annualAuditRequirement", target = "annualAuditRequirement", dateFormat = "MM/dd/yyyy" , defaultValue = "01/01/1900")
     OrganizationHK toOrganiztionHK(OrganizationHKDto organizationHKDto);
 }

atms-web/src/main/webapp/app/common/controls/upload-org-modal/upload-org-modal.ctrl.js

-commonModule.controller('uploadOrgModalController', ['$scope', '$log', '$translate', '$timeout', 'apiInterceptor', 'Upload', 'ackUibModal', '$q', 'SweetAlert','templateService',
-    function ($scope, $log, $translate, $timeout, apiInterceptor, Upload, ackUibModal, $q, SweetAlert,templateService) {
+commonModule.controller('uploadOrgModalController', ['$scope', '$log', '$translate', '$timeout', 'apiInterceptor', 'Upload', 'ackUibModal', '$q', 'SweetAlert', 'templateService',
+    function ($scope, $log, $translate, $timeout, apiInterceptor, Upload, ackUibModal, $q, SweetAlert, templateService) {
         'use strict';
         $log.debug('uploadOrgModalController.ctor()...');
 
@@ -79,11 +79,10 @@ commonModule.controller('uploadOrgModalController', ['$scope', '$log', '$transla
                 });
             }*/
 
-
+            $('#busy-indicator-container').show();
             Upload.upload({
                 url: $scope.importOrgExcelFile,
-                data: {
-                },
+                data: {},
                 file: impExl,
                 headers: {
                     'Access-Control-Allow-Origin': '*',
@@ -117,6 +116,8 @@ commonModule.controller('uploadOrgModalController', ['$scope', '$log', '$transla
                 }
                 SweetAlert.error($translate.instant('ImportFail'));
                 console.log('Error status: ' + resp.status);
+                $scope.fileName = '';
+                $scope.upload.importExcelF = null;
             }, function (evt) {
                 deferred.resolve();
                 var progressPercentage = parseInt(100.0 * evt.loaded / evt.total);

atms-web/src/main/webapp/app/common/controls/upload-org-modal/upload-org-modal.html

@@ -3,7 +3,7 @@
         <div class="modal-header">
             <h4 class="modal-title" style="margin-top: 5px;">{{'BatchUpload' | translate}}</h4>
         </div>
-        <div class="modal-body" id="modal-body" style="height:335px;width:600px">
+        <div class="modal-body" id="modal-body" style="height:100px;width:600px">
             <div class="form-group">
                 <button ng-model="upload.importExcelF" ngf-select=""
                         accept=".xls,.xlsx"
@@ -16,8 +16,10 @@
                 <!--ng-click="doUploadRLIT(importEnum.CoverImport)"></button>-->
                 <button type="button" class="btn btn-vat-primary " translate="AddImportBtn"
                         ng-click="doUploadRLIT(importEnum.AddImport)"></button>
+            </div>
+            <div>
                 <span ng-show="fileName" class="marTop"
-                      title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
+                      title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:100}}</span>
             </div>
         </div>
         <div class="modal-footer">

atms-web/src/main/webapp/app/common/controls/upload-org-modal/upload-org-modal.less

@@ -12,7 +12,7 @@
 
   .modal-dialog {
     width: 653px;
-    height: 409px;
+    height: 200px;
 
     .modal-body {
       height: 100%;