24629 - update logic to show effective date (#3108)

* 24629 - update logic to show effective date * 24629 - hide field and label
bcgov · Dec 3, 2024 · 38f847f · 38f847f
1 parent 1564333
commit 38f847f
Showing 1 changed file with 28 additions and 12 deletions.
diff --git a/legal-api/report-templates/template-parts/common/businessDetails.html b/legal-api/report-templates/template-parts/common/businessDetails.html
@@ -58,7 +58,9 @@
             <td>
                <div class="bold">Incorporation Number:</div>
                <div class="bold pt-2">Issued Date and Time:</div>
-               <div class="bold pt-2">Recognition Date and Time:</div>
+               {% if header.isFutureEffective or header.status == 'COMPLETED' %}
+                  <div class="bold pt-2">Recognition Date and Time:</div>
+               {% endif %}
                <div class="bold pt-2">Retrieved Date and Time:</div>
             </td>
             <td>
@@ -70,7 +72,7 @@
                <div class="pt-2">{{effective_date_time}}</div>
                {% if header.isFutureEffective %}
                   <div class="pt-2">{{effective_date_time}}</div>
-               {% else %}
+               {% elif header.status == 'COMPLETED' %}
                   <div class="pt-2">{{recognition_date_time}}</div>
                {% endif %}
                <div class="pt-2">{{report_date_time}}</div>
@@ -118,7 +120,9 @@
             <td class="col-33">
                <div class="bold">Incorporation Number:</div>
                <div class="bold pt-2">Filed Date and Time:</div>
-               <div class="bold pt-2">Recognition Date and Time:</div>
+               {% if header.isFutureEffective or header.status == 'COMPLETED' %}
+                  <div class="bold pt-2">Recognition Date and Time:</div>
+               {% endif %}
                <div class="bold pt-2">Retrieved Date and Time:</div>
             </td>
             <td>
@@ -130,7 +134,7 @@
                <div class="pt-2">{{filing_date_time}}</div>
                {% if header.isFutureEffective %}
                   <div class="pt-2">{{effective_date_time}}</div> 
-               {% else %}
+               {% elif header.status == 'COMPLETED' %}
                   <div class="pt-2">{{recognition_date_time}}</div>
                {% endif %}
                <div class="pt-2">{{report_date_time}}</div>
@@ -204,26 +208,34 @@
             <td>
                <div class="bold">Incorporation Number:</div>
                <div class="bold pt-2">Filed Date and Time:</div>
-               <div class="bold pt-2">Address Effective Date and Time:</div>
+               {% if header.status == 'COMPLETED' %}
+                  <div class="bold pt-2">Address Effective Date and Time:</div>
+               {% endif %}
                <div class="bold pt-2">Retrieved Date and Time:</div>
             </td>
             <td>
                <div>{{business.identifier}}</div>
                <div class="pt-2">{{filing_date_time}}</div>
-               <div class="pt-2">{{effective_date_time}}</div>
+               {% if header.status == 'COMPLETED' %}
+                  <div class="pt-2">{{effective_date_time}}</div>
+               {% endif %}
                <div class="pt-2">{{report_date_time}}</div>
             </td>
          {% elif header.name == 'changeOfDirectors' %}
             <td>
                <div class="bold">Incorporation Number:</div>
                <div class="bold pt-2">Filed Date and Time:</div>
-               <div class="bold pt-2">Director Change Date:</div>
+               {% if header.status == 'COMPLETED' %}
+                  <div class="bold pt-2">Director Change Date:</div>
+               {% endif %}
                <div class="bold pt-2">Retrieved Date and Time:</div>
             </td>
             <td>
                <div>{{business.identifier}}</div>
                <div class="pt-2">{{filing_date_time}}</div>
-               <div class="pt-2">{{effective_date}}</div>
+               {% if header.status == 'COMPLETED' %}
+                  <div class="pt-2">{{effective_date}}</div>
+               {% endif %}
                <div class="pt-2">{{report_date_time}}</div>
             </td>
          {% elif header.name == 'annualReport' %}
@@ -264,13 +276,17 @@
             <td>
                <div class="bold">Incorporation Number:</div>
                <div class="bold pt-2">Filed Date and Time:</div>
-               <div class="bold pt-2">Alteration Date and Time:</div>
+               {% if header.isFutureEffective or header.status == 'COMPLETED' %}
+                  <div class="bold pt-2">Alteration Date and Time:</div>
+               {% endif %}
                <div class="bold pt-2">Retrieved Date and Time:</div>
             </td>
             <td>
                <div>{{business.identifier}}</div>
                <div class="pt-2">{{filing_date_time}}</div>
-               <div class="pt-2">{{effective_date_time}}</div>
+               {% if header.isFutureEffective or header.status == 'COMPLETED' %}
+                  <div class="pt-2">{{effective_date_time}}</div>
+               {% endif %}
                <div class="pt-2">{{report_date_time}}</div>
             </td>
           {% elif header.name == 'dissolution' %}
@@ -286,7 +302,7 @@
                <div class="bold pt-2">Registration Date:</div>
                {% endif %}
                <div class="bold pt-2">Filed Date and Time:</div>
-               {% if business.legalType not in ['CP', 'SP', 'GP'] %}
+               {% if business.legalType not in ['CP', 'SP', 'GP'] and header.status == 'COMPLETED' %}
                   <div class="bold pt-2">Effective Date and Time:</div>
                {% endif %}
                {% if business.legalType in ['GP', 'SP'] %}
@@ -300,7 +316,7 @@
                   <div class="pt-2">{{ recognition_date_utc }}</div>
                {% endif %}
                <div class="pt-2">{{filing_date_time}}</div>
-               {% if business.legalType not in ['CP', 'SP', 'GP'] %}
+               {% if business.legalType not in ['CP', 'SP', 'GP'] and header.status == 'COMPLETED' %}
                   <div class="pt-2">{{effective_date_time}}</div>
                {% endif %}
                {% if business.legalType in ['GP', 'SP'] %}