Version 5.4.2

Improved bulk status update pages. Minor fixes and updates.

Author: amitdugar

app/generic-tests/results/generic-result-approval.php

@@ -208,6 +208,12 @@
 									</option>
 								</select>
 							</td>
+							<td>&nbsp;<strong>
+									<?php echo _translate("Sample Test Date"); ?>&nbsp;:
+								</strong></td>
+							<td>
+								<input type="text" id="sampleTestDate" name="sampleTestDate" class="form-control" placeholder="<?php echo _translate('Select Test Date'); ?>" readonly style="width:220px;background:#fff;" />
+							</td>
 						</tr>
 						<tr>
 							<td colspan="3">&nbsp;<input type="button" onclick="searchVlRequestData();" value="<?= _translate('Search'); ?>" class="btn btn-success btn-sm">
@@ -397,6 +403,14 @@ class="btn btn-success btn-block">
 
 
 	$(document).ready(function() {
+		$("#batchCode").select2({
+			placeholder: "<?php echo _translate("Select Batch Code"); ?>",
+			allowClear: true
+		});
+		$("#sampleType").select2({
+			placeholder: "<?php echo _translate("Select Sample Type"); ?>",
+			allowClear: true
+		});
 		$("#facilityName").selectize({
 			plugins: ["restore_on_backspace", "remove_button", "clear_button"],
 		});
@@ -414,6 +428,32 @@ class="btn btn-success btn-block">
 		$("#reviewer").select2({
 			placeholder: "<?php echo _translate("Select reviewer"); ?>"
 		});
+		$('#sampleTestDate').daterangepicker({
+				locale: {
+					cancelLabel: "<?= _translate("Clear", true); ?>",
+					format: 'DD-MMM-YYYY',
+					separator: ' to ',
+				},
+				showDropdowns: true,
+				alwaysShowCalendars: false,
+				startDate: moment().subtract(28, 'days'),
+				endDate: moment(),
+				maxDate: moment(),
+				ranges: {
+					'Today': [moment(), moment()],
+					'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+					'Last 7 Days': [moment().subtract(6, 'days'), moment()],
+					'This Month': [moment().startOf('month'), moment().endOf('month')],
+					'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')],
+					'Last 30 Days': [moment().subtract(29, 'days'), moment()],
+					'Last 90 Days': [moment().subtract(89, 'days'), moment()],
+					'Last 120 Days': [moment().subtract(119, 'days'), moment()],
+					'Last 180 Days': [moment().subtract(179, 'days'), moment()],
+					'Last 12 Months': [moment().subtract(12, 'month').startOf('month'), moment().endOf('month')],
+					'Previous Year': [moment().subtract(1, 'year').startOf('year'), moment().subtract(1, 'year').endOf('year')],
+					'Current Year To Date': [moment().startOf('year'), moment()]
+				}
+			});
 		$('#sampleCollectionDate').daterangepicker({
 				locale: {
 					cancelLabel: "<?= _translate("Clear", true); ?>",
@@ -445,6 +485,7 @@ function(start, end) {
 				endDate = end.format('YYYY-MM-DD');
 			});
 		$('#sampleCollectionDate').val("");
+		$('#sampleTestDate').val("");
 		loadVlRequestData();
 	});
 
@@ -519,6 +560,10 @@ function loadVlRequestData() {
 					"name": "sampleCollectionDate",
 					"value": $("#sampleCollectionDate").val()
 				});
+				aoData.push({
+					"name": "sampleTestDate",
+					"value": $("#sampleTestDate").val()
+				});
 				aoData.push({
 					"name": "facilityName",
 					"value": $("#facilityName").val()

app/generic-tests/results/get-generic-results-for-approval.php

@@ -101,13 +101,21 @@
      $sWhere[] =  '  b.batch_code LIKE "%' . $_POST['batchCode'] . '%"';
 }
 [$start_date, $end_date] = DateUtility::convertDateRange($_POST['sampleCollectionDate'] ?? '');
+[$tested_start_date, $tested_end_date] = DateUtility::convertDateRange($_POST['sampleTestDate'] ?? '');
 if (!empty($_POST['sampleCollectionDate'])) {
      if (trim((string) $start_date) === trim((string) $end_date)) {
           $sWhere[] = '  DATE(vl.sample_collection_date) = "' . $start_date . '"';
      } else {
           $sWhere[] =  '  DATE(vl.sample_collection_date) >= "' . $start_date . '" AND DATE(vl.sample_collection_date) <= "' . $end_date . '"';
      }
 }
+if (!empty($_POST['sampleTestDate'])) {
+     if (trim((string) $tested_start_date) === trim((string) $tested_end_date)) {
+          $sWhere[] = '  DATE(vl.sample_tested_datetime) = "' . $tested_start_date . '"';
+     } else {
+          $sWhere[] = '  DATE(vl.sample_tested_datetime) >= "' . $tested_start_date . '" AND DATE(vl.sample_tested_datetime) <= "' . $tested_end_date . '"';
+     }
+}
 if (isset($_POST['sampleType']) && $_POST['sampleType'] != '') {
      $sWhere[] =  ' s.sample_type_id = "' . $_POST['sampleType'] . '"';
 }

app/vl/results/getVlResultsForApproval.php

@@ -66,6 +66,10 @@
      [$start_date, $end_date] = DateUtility::convertDateRange($_POST['sampleCollectionDate'] ?? '');
      $sWhere[] =  "  DATE(vl.sample_collection_date) BEWTEEN '$start_date' AND '$end_date' ";
 }
+if (!empty($_POST['sampleTestDate'])) {
+     [$tested_start_date, $tested_end_date] = DateUtility::convertDateRange($_POST['sampleTestDate'] ?? '');
+     $sWhere[] =  " DATE(vl.sample_tested_datetime) BETWEEN '$tested_start_date' AND '$tested_end_date' ";
+}
 if (isset($_POST['sampleType']) && $_POST['sampleType'] != '') {
      $sWhere[] =  ' s.sample_id = "' . $_POST['sampleType'] . '"';
 }