From 0a59dc6b5d76cb19de5081c26d998e26a8499ab5 Mon Sep 17 00:00:00 2001
From: Sylvain <bond.never.die@gmail.com>
Date: Mon, 7 Jan 2019 10:50:10 +0100
Subject: [PATCH] display previous closings in modal

---
 .../controllers/admin/invoices.js.erb         |  3 +-
 app/assets/stylesheets/modules/invoice.scss   | 40 ++++++++-
 .../admin/invoices/closePeriodModal.html.erb  | 87 ++++++++++++++++++-
 config/locales/app.admin.en.yml               |  5 ++
 config/locales/app.admin.es.yml               |  5 ++
 config/locales/app.admin.fr.yml               |  5 ++
 config/locales/app.admin.pt.yml               | 15 ++--
 7 files changed, 150 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/controllers/admin/invoices.js.erb b/app/assets/javascripts/controllers/admin/invoices.js.erb
index acf3706e6..a7f0c62cd 100644
--- a/app/assets/javascripts/controllers/admin/invoices.js.erb
+++ b/app/assets/javascripts/controllers/admin/invoices.js.erb
@@ -391,7 +391,8 @@ Application.Controllers.controller('InvoicesController', ['$scope', '$state', 'I
       // open modal
       $uibModal.open({
         templateUrl: '<%= asset_path "admin/invoices/closePeriodModal.html" %>',
-        controller: 'ClosePeriodModalController'
+        controller: 'ClosePeriodModalController',
+        size: 'lg'
       });
     }
 
diff --git a/app/assets/stylesheets/modules/invoice.scss b/app/assets/stylesheets/modules/invoice.scss
index 452138f54..682456da9 100644
--- a/app/assets/stylesheets/modules/invoice.scss
+++ b/app/assets/stylesheets/modules/invoice.scss
@@ -178,4 +178,42 @@
     border-radius: 5px;
     font-size: small;
   }
-}
\ No newline at end of file
+}
+
+table.closings-table {
+  width: 100%;
+  border-spacing: 0;
+
+  thead, tbody, tr, th, td { display: block; }
+
+  thead tr {
+    /* fallback */
+    width: 97%;
+    /* minus scroll bar width */
+    width: -webkit-calc(100% - 16px);
+    width:    -moz-calc(100% - 16px);
+    width:         calc(100% - 16px);
+  }
+
+  thead tr th {
+    border-bottom: 0;
+  }
+
+  tr:after {  /* clearing float */
+    content: ' ';
+    display: block;
+    visibility: hidden;
+    clear: both;
+  }
+
+  tbody {
+    height: 200px;
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+
+  tbody td, thead th {
+    width: 24%;  /* 24% is less than (100% / 4 cols) = 25% */
+    float: left;
+  }
+}
diff --git a/app/assets/templates/admin/invoices/closePeriodModal.html.erb b/app/assets/templates/admin/invoices/closePeriodModal.html.erb
index f52d11b94..186a6dbca 100644
--- a/app/assets/templates/admin/invoices/closePeriodModal.html.erb
+++ b/app/assets/templates/admin/invoices/closePeriodModal.html.erb
@@ -2,8 +2,8 @@
   <h3 class="text-center red" translate>{{ 'invoices.close_accounting_period' }}</h3>
 </div>
 <div class="modal-body">
-  <form name="closePeriodForm" novalidate="novalidate">
-    <div class="form-group" ng-class="{'has-error': closePeriodForm.start_date.$dirty && closePeriodForm.start_date.$invalid }">
+  <form name="closePeriodForm" novalidate="novalidate" class="row">
+    <div class="form-group col-md-6" ng-class="{'has-error': closePeriodForm.start_date.$dirty && closePeriodForm.start_date.$invalid }">
       <label translate>{{ 'invoices.close_from_date' }}</label>
       <div class="input-group">
         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
@@ -20,7 +20,7 @@
       </div>
       <span class="help-block" ng-show="closePeriodForm.start_date.$dirty && closePeriodForm.start_date.$error.required" translate>{{ 'invoices.start_date_is_required' }}</span>
     </div>
-    <div class="form-group" ng-class="{'has-error': closePeriodForm.end_date.$dirty && closePeriodForm.end_date.$invalid }">
+    <div class="form-group col-md-6" ng-class="{'has-error': closePeriodForm.end_date.$dirty && closePeriodForm.end_date.$invalid }">
       <label translate>{{ 'invoices.close_until_date' }}</label>
       <div class="input-group">
         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
@@ -38,6 +38,87 @@
       <span class="help-block" ng-show="closePeriodForm.end_date.$dirty && closePeriodForm.end_date.$error.required" translate>{{ 'invoices.end_date_is_required' }}</span>
     </div>
   </form>
+  <div>
+    <h4 translate>{{ 'invoices.previous_closings' }}</h4>
+    <table class="table closings-table">
+      <thead>
+        <tr>
+          <th translate>{{ 'invoices.start_date' }}</th>
+          <th translate>{{ 'invoices.end_date' }}</th>
+          <th translate>{{ 'invoices.closed_at' }}</th>
+          <th translate>{{ 'invoices.closed_by' }}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>01/01/1970</td>
+          <td>01/01/1971</td>
+          <td>04/01/2019 18:12</td>
+          <td>Roger Rabbit</td>
+        </tr>
+        <tr>
+          <td>01/01/1971</td>
+          <td>01/01/1972</td>
+          <td>04/01/2019 18:12</td>
+          <td>Roger Rabbit</td>
+        </tr>
+        <tr>
+          <td>01/01/1972</td>
+          <td>01/01/1973</td>
+          <td>04/01/2019 18:12</td>
+          <td>Roger Rabbit</td>
+        </tr>
+        <tr>
+          <td>01/01/1973</td>
+          <td>01/01/1974</td>
+          <td>04/01/2019 18:12</td>
+          <td>Roger Rabbit</td>
+        </tr>
+        <tr>
+          <td>01/01/1974</td>
+          <td>01/01/1975</td>
+          <td>04/01/2019 18:12</td>
+          <td>Roger Rabbit</td>
+        </tr>
+        <tr>
+          <td>01/01/1975</td>
+          <td>01/01/1976</td>
+          <td>04/01/2019 18:12</td>
+          <td>Roger Rabbit</td>
+        </tr>
+        <tr>
+          <td>01/01/1976</td>
+          <td>01/01/1977</td>
+          <td>04/01/2019 18:12</td>
+          <td>Roger Rabbit</td>
+        </tr>
+        <tr>
+          <td>01/01/1977</td>
+          <td>01/01/1978</td>
+          <td>04/01/2019 18:12</td>
+          <td>Roger Rabbit</td>
+        </tr>
+        <tr>
+          <td>01/01/1978</td>
+          <td>01/01/1979</td>
+          <td>04/01/2019 18:12</td>
+          <td>Roger Rabbit</td>
+        </tr>
+        <tr>
+          <td>01/01/1979</td>
+          <td>01/01/1980</td>
+          <td>04/01/2019 18:12</td>
+          <td>Roger Rabbit</td>
+        </tr>
+        <tr>
+          <td>01/01/1980</td>
+          <td>01/01/2019</td>
+          <td>04/01/2019 18:12</td>
+          <td>Roger Rabbit</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
 </div>
 <div class="modal-footer">
   <button class="btn btn-warning" ng-click="ok()" ng-disabled="closePeriodForm.$invalid" translate>{{ 'confirm' }}</button>
diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml
index c4666bc23..aba5349b7 100644
--- a/config/locales/app.admin.en.yml
+++ b/config/locales/app.admin.en.yml
@@ -407,6 +407,11 @@ en:
           start_date_is_required: "Start date is required"
           close_until_date: "Close until"
           end_date_is_required: "End date is required"
+          previous_closings: "Previous closings"
+          start_date: "From"
+          end_date: "To"
+          closed_at: "Closed at"
+          closed_by: "By"
 
       members:
         # management of users, labels, groups, and so on
diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml
index bbc73a549..cda29ba18 100644
--- a/config/locales/app.admin.es.yml
+++ b/config/locales/app.admin.es.yml
@@ -407,6 +407,11 @@ es:
           start_date_is_required: "Start date is required"                             # translation_missing
           close_until_date: "Close until"                                              # translation_missing
           end_date_is_required: "End date is required"                                 # translation_missing
+          previous_closings: "Previous closings"                                       # translation_missing
+          start_date: "From"                                                           # translation_missing
+          end_date: "To"                                                               # translation_missing
+          closed_at: "Closed at"                                                       # translation_missing
+          closed_by: "By"                                                              # translation_missing
 
       members:
         # management of users, labels, groups, and so on
diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml
index 14a11f3db..ddd2669ad 100644
--- a/config/locales/app.admin.fr.yml
+++ b/config/locales/app.admin.fr.yml
@@ -407,6 +407,11 @@ fr:
           start_date_is_required: "La date de début est requise"
           close_until_date: "Clôturer jusqu'au"
           end_date_is_required: "La date de fin est requise"
+          previous_closings: "Fermetures précédentes"
+          start_date: "Du"
+          end_date: "Au"
+          closed_at: "Clôturé le"
+          closed_by: "Par"
 
       members:
         # gestion des utilisateurs, des groupes, des étiquettes, etc.
diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml
index 937c28117..940e7c00c 100755
--- a/config/locales/app.admin.pt.yml
+++ b/config/locales/app.admin.pt.yml
@@ -402,11 +402,16 @@ pt:
           logo_successfully_saved: "Logo salvo com sucesso."
           an_error_occurred_while_saving_the_logo: "Um erro ocorreu ao salvar o logo."
           online_payment: "Pagamento Online"
-          close_accounting_period: "Close an accounting period"                     # translation_missing
-          close_from_date: "Close from"                                             # translation_missing
-          start_date_is_required: "Start date is required"                          # translation_missing
-          close_until_date: "Close until"                                           # translation_missing
-          end_date_is_required: "End date is required"                              # translation_missing
+          close_accounting_period: "Close an accounting period"                        # translation_missing
+          close_from_date: "Close from"                                                # translation_missing
+          start_date_is_required: "Start date is required"                             # translation_missing
+          close_until_date: "Close until"                                              # translation_missing
+          end_date_is_required: "End date is required"                                 # translation_missing
+          previous_closings: "Previous closings"                                       # translation_missing
+          start_date: "From"                                                           # translation_missing
+          end_date: "To"                                                               # translation_missing
+          closed_at: "Closed at"                                                       # translation_missing
+          closed_by: "By"                                                              # translation_missing
 
       members:
         # management of users, labels, groups, and so on