diff --git a/mhr_api/report-templates/exemptionV2.html b/mhr_api/report-templates/exemptionV2.html index 6db2c8a29..4c8f5c5a1 100644 --- a/mhr_api/report-templates/exemptionV2.html +++ b/mhr_api/report-templates/exemptionV2.html @@ -90,15 +90,26 @@
- Exempted pursuant to section 21 of the Manufactured Home Act by an order of the Registrar dated {{createDateTime}} on Document Registration Number {{documentRegistrationNumber}}. + {% if registrationType == 'EXEMPTION_NON_RES' %} + Exempted pursuant to section 21 of the Manufactured Home Act by an order of the Registrar dated {{createDateTime}} + on Document Registration Number {{documentRegistrationNumber}}. + {% else %} + Pursuant to section 21 of the Manufactured Home Act, this manufactured home is exempted from the act except section 32 by an order of the Registrar + dated {{createDateTime}} on Document Registration Number {{documentRegistrationNumber}}. + {% endif %}

Exemption Order
- I ORDER, under section 21 of the Manufactured Home Act, that the manufactured home registered - under number {{mhrNumber}} be exempt from the Act. The exemption was processed under document registration number {{documentRegistrationNumber}}. + {% if registrationType == 'EXEMPTION_NON_RES' %} + I ORDER, under section 21 of the Manufactured Home Act, that the manufactured home registered + under number {{mhrNumber}} be exempt from the Act. The exemption was processed under document registration number {{documentRegistrationNumber}}. + {% else %} + I ORDER, under section 21 of the Manufactured Home Act, that the manufactured home registered + under number {{mhrNumber}} be exempt from the Act except section 32. The exemption was processed under document registration number {{documentRegistrationNumber}}. + {% endif %}
{% if registrationType == 'EXEMPTION_NON_RES' %} diff --git a/mhr_api/report-templates/template-parts/registration/location.html b/mhr_api/report-templates/template-parts/registration/location.html index 4381a5027..9d3fe14da 100644 --- a/mhr_api/report-templates/template-parts/registration/location.html +++ b/mhr_api/report-templates/template-parts/registration/location.html @@ -115,7 +115,7 @@ {{location.bandName}}  {% endif %} {% if location.reserveNumber is defined and location.reserveNumber != '' %} - {{location.reserveNumber}}  + RESERVATION #{{location.reserveNumber}}  {% endif %} {% if location.additionalDescription is defined and location.additionalDescription != '' %} {{ location.additionalDescription }} @@ -177,7 +177,7 @@ {{location.bandName}}  {% endif %} {% if location.reserveNumber is defined and location.reserveNumber != '' %} - {{location.reserveNumber}}  + RESERVATION #{{location.reserveNumber}}  {% endif %} {% if location.additionalDescription is defined and location.additionalDescription != '' %} {{ location.additionalDescription }} diff --git a/mhr_api/report-templates/template-parts/search-result/location.html b/mhr_api/report-templates/template-parts/search-result/location.html index 3ae869277..f876268f0 100644 --- a/mhr_api/report-templates/template-parts/search-result/location.html +++ b/mhr_api/report-templates/template-parts/search-result/location.html @@ -100,7 +100,7 @@ {{detail.location.bandName}}  {% endif %} {% if detail.location.reserveNumber is defined and detail.location.reserveNumber != '' %} - {{detail.location.reserveNumber}}  + RESERVATION #{{detail.location.reserveNumber}}  {% endif %} {% if detail.location.additionalDescription is defined and detail.location.additionalDescription != '' %} {{ detail.location.additionalDescription }} @@ -165,7 +165,7 @@ {{detail.location.bandName}}  {% endif %} {% if detail.location.reserveNumber is defined and detail.location.reserveNumber != '' %} - {{detail.location.reserveNumber}}  + RESERVATION #{{detail.location.reserveNumber}}  {% endif %} {% if detail.location.additionalDescription is defined and detail.location.additionalDescription != '' %} {{ detail.location.additionalDescription }} diff --git a/mhr_api/report-templates/template-parts/v2/search-result/registration.html b/mhr_api/report-templates/template-parts/v2/search-result/registration.html index 4279b44ac..3a1c7091f 100644 --- a/mhr_api/report-templates/template-parts/v2/search-result/registration.html +++ b/mhr_api/report-templates/template-parts/v2/search-result/registration.html @@ -87,18 +87,21 @@ Registration of this home was cancelled under Section 11(1) of the Manufactured Home Act by the Registrar of Manufactured Homes. {% elif message.messageType == 'WIDTH' %} SPECIAL TRANSPORT RESTRICTIONS APPLY TO THIS HOME DUE TO THE WIDTH. PLEASE CONTACT PROVINCIAL PERMIT CENTRE 1-800-559-9688 FOR FURTHER DETAILS. - {% elif message.messageType in ('EXNR', 'EXRS') %} - Exempted pursuant to section 21 of the Manufactured Home Act by an order of the Registrar dated {{message.messageDate}} on Document Registration Number {{message.messageId}}. + {% elif message.messageType == 'EXRS' %} + Pursuant to section 21 of the Manufactured Home Act, this manufactured home is exempted from the Act except section 32 + by an order of the Registrar dated {{message.messageDate}} on Document Registration Number {{message.messageId}}.
- {% if message.messageType == 'EXRS' %} If this manufactured home is to be moved from the land to which it is attached, or a person buying it wishes to reflect their name on the ownership in the Manufactured Home Registry, this exemption order expires. The manufactured home will be subject to the Manufactured Home Act, and the registration of this manufactured home must be restored. - {% else %} +
+ {% elif message.messageType == 'EXNR' %} + Exempted pursuant to section 21 of the Manufactured Home Act by an order of the Registrar dated {{message.messageDate}} + on Document Registration Number {{message.messageId}}. +
If this manufactured home returned to use for residential accommodation, or a person buying it wishes to reflect their name on the ownership in the Manufactured Home Registry, this exemption order expires. The manufactured home will be subject to the Manufactured Home Act, and the registration of this manufactured home must be restored. - {% endif %}
{% elif message.messageType == 'EXEMPT' %} Exempted pursuant to Section 21 of the Manufactured Home Act by an order of the Registrar of the Manufactured Home Registry. diff --git a/mhr_api/src/mhr_api/models/db2/location.py b/mhr_api/src/mhr_api/models/db2/location.py index fd2cd4aad..f87a4f8cb 100755 --- a/mhr_api/src/mhr_api/models/db2/location.py +++ b/mhr_api/src/mhr_api/models/db2/location.py @@ -381,7 +381,7 @@ def create_from_registration(registration, reg_json, update: bool = False): if new_info.get('bandName'): additional_desc += str(new_info.get('bandName')).strip().upper() + ' ' if new_info.get('reserveNumber'): - additional_desc += str(new_info.get('reserveNumber')).strip() + ' ' + additional_desc += 'RESERVATION #' + str(new_info.get('reserveNumber')).strip() + ' ' if new_info.get('additionalDescription'): additional_desc += new_info.get('additionalDescription') if additional_desc: diff --git a/mhr_api/src/mhr_api/reports/v2/report.py b/mhr_api/src/mhr_api/reports/v2/report.py index 056daaae8..1f45a7294 100755 --- a/mhr_api/src/mhr_api/reports/v2/report.py +++ b/mhr_api/src/mhr_api/reports/v2/report.py @@ -484,7 +484,8 @@ def _set_owner_groups(self): def _set_location(self): """Set up report location information.""" - if self._report_key in (ReportTypes.MHR_REGISTRATION, ReportTypes.MHR_EXEMPTION): + if self._report_key in (ReportTypes.MHR_REGISTRATION, ReportTypes.MHR_EXEMPTION, + ReportTypes.MHR_ADMIN_REGISTRATION, ReportTypes.MHR_TRANSPORT_PERMIT): location = self._report_data.get('location') if location.get('lot') or location.get('parcel') or location.get('block') or location.get('districtLot') or\ location.get('partOf') or location.get('section') or location.get('township') or \