From 913988897cdf3467f62c8bfa2bd321c0a4127f19 Mon Sep 17 00:00:00 2001
From: Adam Zammit <adam.zammit@acspri.org.au>
Date: Fri, 8 Nov 2019 15:06:12 +1100
Subject: [PATCH] Set standard order for samples and questionnaires

---
 admin/samplesearch.php          | 2 +-
 functions/functions.display.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin/samplesearch.php b/admin/samplesearch.php
index e57e71cc..c23e0ed5 100644
--- a/admin/samplesearch.php
+++ b/admin/samplesearch.php
@@ -231,7 +231,7 @@ xhtml_head(T_("Search the sample"),true,$css,$js_head);
 echo "<a href='' onclick='history.back();return false;' class='btn btn-default pull-left' ><i class='fa fa-chevron-left text-primary'></i>&emsp;" . T_("Go back") . "</a>";
 
 $sql = "SELECT sample_import_id as value,description, CASE WHEN sample_import_id = '$sample_import_id' THEN 'selected=\'selected\'' ELSE '' END AS selected
-	FROM sample_import ORDER BY sample_import_id DESC";
+	FROM sample_import ORDER BY sample_import_id ASC";
 $r = $db->GetAll($sql);
 
 if(!empty($r))
diff --git a/functions/functions.display.php b/functions/functions.display.php
index 10fdb592..8fb118c2 100644
--- a/functions/functions.display.php
+++ b/functions/functions.display.php
@@ -129,7 +129,8 @@ function display_sample_chooser($questionnaire_id, $sample_import_id = false, $d
 		FROM questionnaire_sample as s, sample_import as si $qr
 		WHERE s.questionnaire_id = '$questionnaire_id'
 		AND s.sample_import_id = si.sample_import_id $s $qrq
-		GROUP BY s.sample_import_id";
+        GROUP BY s.sample_import_id
+        ORDER BY s.sample_import_id ASC";
 		
 	$rs = $db->GetAll($sql);