Modified all points Allan sent via email on 04-05-2026

This commit is contained in:
James Richie
2026-04-08 20:09:13 -04:00
parent da832f82fc
commit cb9e1a9fa1
11 changed files with 422 additions and 480 deletions
+29 -11
View File
@@ -12,9 +12,9 @@
<div class="modal-header bg-primary">
<h5 class="modal-title text-white" id="permit-details-title">
<xsl:value-of select="//permit/record/rdi_sub_div_name"/>
<xsl:value-of select="//permit/record/permit_sub_div_name"/>
<xsl:text> - </xsl:text>
<xsl:value-of select="concat(//permit/record/rdi_project_addr, ' ', //permit/record/rdi_project_city, ' ', //permit/record/rdi_project_state)"/>
<xsl:value-of select="concat(//permit/record/permit_project_addr, ' ', //permit/record/permit_project_city, ' ', //permit/record/permit_project_state)"/>
</h5>
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
@@ -26,21 +26,39 @@
<div class="col-md-4">
<label class="form-label">Permit Number</label>
<p class="mb-0">
<xsl:value-of select="//permit/record/rdi_permit_number"/>
<xsl:value-of select="//permit/record/permit_permit_number"/>
</p>
</div>
<div class="col-md-4">
<label class="form-label">Permit Date</label>
<p class="mb-0">
<xsl:value-of select="//permit/record/rdi_permit_date_verbose"/>
<xsl:value-of select="//permit/record/permit_permit_date_verbose"/>
</p>
</div>
<div class="col-md-4">
<label class="form-label">Entry Date</label>
<p class="mb-0">
<xsl:value-of select="//permit/record/rdi_entry_date_verbose"/>
<xsl:value-of select="//permit/record/permit_entry_date_verbose"/>
</p>
</div>
</div>
<hr class="my-3"/>
<div class="row g-3">
<div class="col-md-4">
<label class="form-label">Value</label>
<p class="mb-0">
<xsl:value-of select="//permit/record/permit_value_verbose"/>
</p>
</div>
<div class="col-md-4">
<label class="form-label">Square Footage</label>
<p class="mb-0">
<xsl:value-of select="//permit/record/permit_size_verbose"/>
</p>
</div>
</div>
@@ -51,14 +69,14 @@
<div class="col-md-6">
<label class="form-label">Project Address</label>
<p class="mb-0">
<xsl:value-of select="concat(//permit/record/rdi_project_addr, ' ', //permit/record/rdi_project_city, ', ', //permit/record/rdi_project_state, ' ', //permit/record/rdi_zip)"/>
<xsl:value-of select="concat(//permit/record/permit_project_addr, ' ', //permit/record/permit_project_city, ', ', //permit/record/permit_project_state, ' ', //permit/record/permit_zip)"/>
</p>
</div>
<div class="col-md-6">
<label class="form-label">Owner Address</label>
<p class="mb-0">
<xsl:value-of select="concat(//permit/record/rdi_owner_address, ' ', //permit/record/rdi_owner_city, ', ', //permit/record/rdi_owner_state, ' ', //permit/record/rdi_owner_zip)"/>
<xsl:value-of select="concat(//permit/record/permit_owner_address, ' ', //permit/record/permit_owner_city, ', ', //permit/record/permit_owner_state, ' ', //permit/record/permit_owner_zip)"/>
</p>
</div>
</div>
@@ -69,14 +87,14 @@
<div class="col-md-6">
<label class="form-label">Company</label>
<p class="mb-0">
<xsl:value-of select="//permit/record/rdi_company"/>
<xsl:value-of select="//permit/record/permit_company"/>
</p>
</div>
<div class="col-md-6">
<label class="form-label">Project Name</label>
<p class="mb-0">
<xsl:value-of select="//permit/record/rdi_sub_div_name"/>
<xsl:value-of select="//permit/record/permit_sub_div_name"/>
</p>
</div>
</div>
@@ -87,14 +105,14 @@
<div class="col-md-6">
<label class="form-label">County</label>
<p class="mb-0">
<xsl:value-of select="//permit/record/rdi_county"/>
<xsl:value-of select="//permit/record/permit_county"/>
</p>
</div>
<div class="col-md-6">
<label class="form-label">Owner Name</label>
<p class="mb-0">
<xsl:value-of select="//permit/record/rdi_owner_name"/>
<xsl:value-of select="//permit/record/permit_owner_name"/>
</p>
</div>
</div>
+9 -8
View File
@@ -376,14 +376,6 @@
<td class="ytd_permits text-nowrap filterable text-center">
<xsl:value-of select="ytd_permits"/>
</td>
<td class="permit_ytd_value filterable text-center">
<xsl:value-of select="concat('$', format-number(ytd_value, '###,###'))"/>
</td>
<td class="permit_12mth_prev_permits filterable text-center">
<xsl:value-of select="previous_ytd_permits"/>
<xsl:choose>
<xsl:when test="permits_trend = 'up'">
<i class="bi bi-arrow-up text-success"></i>
@@ -397,6 +389,15 @@
</xsl:choose>
</td>
<td class="permit_ytd_value filterable text-center">
<xsl:value-of select="concat('$', format-number(ytd_value, '###,###'))"/>
</td>
<td class="permit_12mth_prev_permits filterable text-center">
<xsl:value-of select="previous_ytd_permits"/>
</td>
<td class="permit_address filterable">
<xsl:value-of select="concat(permit_address, ' ', permit_city, ', ', permit_state, ' ', permit_zip)"/>
</td>
+66 -66
View File
@@ -11,10 +11,10 @@
<!-- Variables -->
<xsl:variable name="PAGINATION_COUNT" select="//rdis/@count"/>
<xsl:variable name="PAGINATION_START" select="//rdis/@start"/>
<xsl:variable name="PAGINATION_END" select="//rdis/@end"/>
<xsl:variable name="PAGINATION_PAGE" select="//rdis/@page"/>
<xsl:variable name="PAGINATION_COUNT" select="//permits/@count"/>
<xsl:variable name="PAGINATION_START" select="//permits/@start"/>
<xsl:variable name="PAGINATION_END" select="//permits/@end"/>
<xsl:variable name="PAGINATION_PAGE" select="//permits/@page"/>
<xsl:template match="/">
@@ -47,15 +47,15 @@
<div class="row">
<div class="col-lg-4 mb-3">
<label class="form-label" for="rdi_county">County</label>
<select class="form-control form-control-sm multiple-dropdown" multiple="multiple" name="rdi_county" id="rdi_county" size="1">
<label class="form-label" for="permit_county">County</label>
<select class="form-control form-control-sm multiple-dropdown" multiple="multiple" name="permit_county" id="permit_county" size="1">
<xsl:apply-templates select="//counties"/>
</select>
</div>
<div class="col-lg-1 mb-3">
<label class="form-label" for="rdi_and_or">And/Or</label>
<select class="form-select form-select-sm" name="rdi_and_or" id="rdi_and_or" size="1">
<label class="form-label" for="permit_and_or">And/Or</label>
<select class="form-select form-select-sm" name="permit_and_or" id="permit_and_or" size="1">
<option value="and">And</option>
<option value="or">Or</option>
</select>
@@ -66,59 +66,59 @@
<div class="row">
<div class="col-lg-3 mb-3">
<label class="form-label" for="rdi_company">Company/Builder</label>
<input type="text" class="form-control form-control-sm" name="rdi_company" id="rdi_company" maxlength="120" autocomplete="off" autofocus="autofocus"/>
<label class="form-label" for="permit_company">Company/Builder</label>
<input type="text" class="form-control form-control-sm" name="permit_company" id="permit_company" maxlength="120" autocomplete="off" autofocus="autofocus"/>
</div>
<div class="col-lg-3 mb-3">
<label class="form-label" for="rdi_sub_div_name">Subdivision</label>
<input type="text" class="form-control form-control-sm subdivision-autocomplete" autocomplete="chrome-off" name="rdi_sub_div_name" id="rdi_sub_div_name" maxlength="100"/>
<label class="form-label" for="permit_sub_div_name">Subdivision</label>
<input type="text" class="form-control form-control-sm subdivision-autocomplete" autocomplete="chrome-off" name="permit_sub_div_name" id="permit_sub_div_name" maxlength="100"/>
</div>
<div class="col-lg-3 mb-3">
<label class="form-label" for="rdi_project_city">City</label>
<input type="text" class="form-control form-control-sm city-autocomplete" autocomplete="chrome-off" name="rdi_project_city" id="rdi_project_city" maxlength="100"/>
<label class="form-label" for="permit_project_city">City</label>
<input type="text" class="form-control form-control-sm city-autocomplete" autocomplete="chrome-off" name="permit_project_city" id="permit_project_city" maxlength="100"/>
</div>
<div class="col-lg-3 mb-3">
<label class="form-label" for="rdi_project_addr">Street Name</label>
<input type="text" class="form-control form-control-sm street-autocomplete" autocomplete="chrome-off" name="rdi_project_addr" id="rdi_project_addr" maxlength="100"/>
<label class="form-label" for="permit_project_addr">Street Name</label>
<input type="text" class="form-control form-control-sm street-autocomplete" autocomplete="chrome-off" name="permit_project_addr" id="permit_project_addr" maxlength="100"/>
</div>
</div>
<div class="row">
<div class="col-lg-2 mb-3">
<label class="form-label" for="rdi_entry_start_date">Entry Start Date</label>
<div class="input-group input-group-sm rdi_entry_start_date">
<input type="text" class="form-control form-control-sm date-mask" name="rdi_entry_start_date" id="rdi_entry_start_date" autocomplete="off" value=""/>
<label class="form-label" for="permit_entry_start_date">Entry Start Date</label>
<div class="input-group input-group-sm permit_entry_start_date">
<input type="text" class="form-control form-control-sm date-mask" name="permit_entry_start_date" id="permit_entry_start_date" autocomplete="off" value=""/>
<button class="btn btn-sm btn-outline-primary btnEntryStartDateCalendar" type="button" data-bs-toggle="tooltip" data-bs-title="Calendar" data-bs-custom-class="custom-tooltip" tabindex="-1">
<i class="bi bi-calendar3"/>
</button>
</div>
</div>
<div class="col-lg-2 mb-3">
<label class="form-label" for="rdi_entry_end_date">Entry End Date</label>
<div class="input-group input-group-sm rdi_entry_end_date">
<input type="text" class="form-control form-control-sm date-mask" name="rdi_entry_end_date" id="rdi_entry_end_date" autocomplete="off" value=""/>
<label class="form-label" for="permit_entry_end_date">Entry End Date</label>
<div class="input-group input-group-sm permit_entry_end_date">
<input type="text" class="form-control form-control-sm date-mask" name="permit_entry_end_date" id="permit_entry_end_date" autocomplete="off" value=""/>
<button class="btn btn-sm btn-outline-primary btnEntryEndDateCalendar" type="button" data-bs-toggle="tooltip" data-bs-title="Calendar" data-bs-custom-class="custom-tooltip" tabindex="-1">
<i class="bi bi-calendar3"/>
</button>
</div>
</div>
<div class="col-lg-2 mb-3">
<label class="form-label" for="rdi_permit_start_date">Permit Start Date</label>
<div class="input-group input-group-sm rdi_permit_start_date">
<input type="text" class="form-control form-control-sm date-mask" name="rdi_permit_start_date" id="rdi_permit_start_date" autocomplete="off" value=""/>
<label class="form-label" for="permit_permit_start_date">Permit Start Date</label>
<div class="input-group input-group-sm permit_permit_start_date">
<input type="text" class="form-control form-control-sm date-mask" name="permit_permit_start_date" id="permit_permit_start_date" autocomplete="off" value=""/>
<button class="btn btn-sm btn-outline-primary btnPermitStartDateCalendar" type="button" data-bs-toggle="tooltip" data-bs-title="Calendar" data-bs-custom-class="custom-tooltip" tabindex="-1">
<i class="bi bi-calendar3"/>
</button>
</div>
</div>
<div class="col-lg-2 mb-3">
<label class="form-label" for="rdi_permit_end_date">Permit End Date</label>
<div class="input-group input-group-sm rdi_permit_end_date">
<input type="text" class="form-control form-control-sm date-mask" name="rdi_permit_end_date" id="rdi_permit_end_date" autocomplete="off"/>
<label class="form-label" for="permit_permit_end_date">Permit End Date</label>
<div class="input-group input-group-sm permit_permit_end_date">
<input type="text" class="form-control form-control-sm date-mask" name="permit_permit_end_date" id="permit_permit_end_date" autocomplete="off"/>
<button class="btn btn-sm btn-outline-primary btnPermitEndDateCalendar" type="button" data-bs-toggle="tooltip" data-bs-title="Calendar" data-bs-custom-class="custom-tooltip" tabindex="-1">
<i class="bi bi-calendar3"/>
</button>
@@ -148,7 +148,7 @@
<xsl:choose>
<xsl:when test="count(//rdis/record) > 0">
<xsl:when test="count(//permits/record) > 0">
<div class="card mt-3">
@@ -183,7 +183,7 @@
<div class="input-group-text">
<i class="bi bi-list-ol"/>
</div>
<select class="form-select" name="rdis_per_page" id="rdis_per_page">
<select class="form-select" name="permits_per_page" id="permits_per_page">
<option value="20">20</option>
<option value="40">40</option>
<option value="60">60</option>
@@ -199,7 +199,7 @@
<div class="buttons mt-1 mb-1">
<xsl:if test="count(//rdis/record) > 0">
<xsl:if test="count(//permits/record) > 0">
<button type="button" class="btn btn-sm btn-primary me-2 mb-2 btnSelectAll">
<i class="bi bi-check2-square me-2"/>Select All</button>
</xsl:if>
@@ -268,7 +268,7 @@
<xsl:choose>
<xsl:when test="count(//rdis/record) = 0">
<xsl:when test="count(//permits/record) = 0">
@@ -282,19 +282,19 @@
<div class="table-responsive scrollable">
<table class="table table-sm table-striped table-hover base-table" id="rdis-table">
<table class="table table-sm table-striped table-hover base-table" id="permits-table">
<thead class="sticky-header" data-theme="{$THEME}">
<th class="text-center">Select</th>
<th class="sortable text-nowrap" data-order-by="rdi_county" >County</th>
<th class="sortable text-nowrap" data-order-by="rdi_sub_div_name">Subdivison/Project Name</th>
<th class="sortable text-nowrap" data-order-by="rdi_project_addr">Address</th>
<th class="text-nowrap" data-order-by="rdi_project_city">City</th>
<th class="text-nowrap" data-order-by="rdi_state" >State</th>
<th class="text-nowrap" data-order-by="rdi_zip" >Zip</th>
<th class="sortable text-nowrap" data-order-by="permit_county" >County</th>
<th class="sortable text-nowrap" data-order-by="permit_sub_div_name">Subdivison/Project Name</th>
<th class="sortable text-nowrap" data-order-by="permit_project_addr">Address</th>
<th class="text-nowrap" data-order-by="permit_project_city">City</th>
<th class="text-nowrap" data-order-by="permit_state" >State</th>
<th class="text-nowrap" data-order-by="permit_zip" >Zip</th>
<th class="text-nowrap" >Builder</th>
<th class="sortable text-nowrap" data-order-by="rdi_permit_date" >Permit Date</th>
<th class="sortable text-nowrap" data-order-by="permit_permit_date" >Permit Date</th>
<th class="text-nowrap" >Sq. Ft. </th>
<th class="text-nowrap" >Value</th>
@@ -302,7 +302,7 @@
<tbody>
<xsl:apply-templates select="//rdis"/>
<xsl:apply-templates select="//permits"/>
</tbody>
@@ -382,54 +382,54 @@
<!-- Template for RDI rows -->
<xsl:template match="rdis/record">
<xsl:template match="permits/record">
<tr class="hoverable rdi-row text-nowrap" data-rdi-serial="{rdi_serial}">
<tr class="hoverable permit-row text-nowrap" data-permit-serial="{permit_serial}">
<td class="checkbox text-center selection-checkboxes selection-area">
<input type="checkbox" class="selection-checkbox selection-area" name="selected[]" value="{rdi_serial}">
<input type="checkbox" class="selection-checkbox selection-area" name="selected[]" value="{permit_serial}">
</input>
<span class="selection-area user-select-none">&#160;</span>
</td>
<td class="rdi_county filterable">
<xsl:value-of select="rdi_county_name_verbose"/>
<td class="permit_county filterable">
<xsl:value-of select="permit_county_name_verbose"/>
</td>
<td class="rdi_sub_div_name text-nowrap filterable">
<xsl:value-of select="rdi_sub_div_name"/>
<td class="permit_sub_div_name text-nowrap filterable">
<xsl:value-of select="permit_sub_div_name"/>
</td>
<td class="rdi_address text-nowrap filterable">
<xsl:value-of select="rdi_project_addr"/>
<td class="permit_address text-nowrap filterable">
<xsl:value-of select="permit_project_addr"/>
</td>
<td class="rdi_address text-nowrap">
<xsl:value-of select="rdi_project_city"/>
<td class="permit_address text-nowrap">
<xsl:value-of select="permit_project_city"/>
</td>
<td class="rdi_address text-nowrap">
<xsl:value-of select="rdi_state"/>
<td class="permit_address text-nowrap">
<xsl:value-of select="permit_state"/>
</td>
<td class="rdi_address text-nowrap">
<xsl:value-of select="rdi_zip"/>
<td class="permit_address text-nowrap">
<xsl:value-of select="permit_zip"/>
</td>
<td class="rdi_company filterable">
<xsl:value-of select="rdi_company"/>
<td class="permit_company filterable">
<xsl:value-of select="permit_company"/>
</td>
<td class="rdi_permit_date filterable">
<xsl:value-of select="rdi_permit_date_verbose"/>
<td class="permit_permit_date filterable">
<xsl:value-of select="permit_permit_date_verbose"/>
</td>
<td class="rdi_value filterable">
<xsl:value-of select="rdi_size_verbose"/>
<td class="permit_value filterable">
<xsl:value-of select="permit_size_verbose"/>
</td>
<td class="rdi_value filterable">
<xsl:value-of select="rdi_value_verbose"/>
<td class="permit_value filterable">
<xsl:value-of select="permit_value_verbose"/>
</td>
</tr>
@@ -443,9 +443,9 @@
<option value="{county_serial}" data-tokens="{county_serial}">
<!-- <xsl:if test="//searchhistory/record/searchhistory_parameters/permitfact_county/id = subscriptioncounty_county">
<xsl:if test="//searchhistory/record/searchhistory_parameters/permit_county/id = county_serial">
<xsl:attribute name="selected">selected</xsl:attribute>
</xsl:if>-->
</xsl:if>
<xsl:value-of select="county_name"/>
</option>