Changeset 1064

Timestamp:

07/01/09 16:07:15 (4 years ago)

Author:

glickn

Message:

Fixed - Sorting for Chemical Analyses

Location:

trunk

Files:

• mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/list/ChemicalAnalysisList.java (modified) (8 diffs)
• mpdb-server/src/edu/rpi/metpetdb/server/dao/ChemicalAnalysis.hbm.xml (modified) (3 diffs)

trunk/mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/list/ChemicalAnalysisList.java

@@ -81 +81 @@
                                 }
                         };
-                        col.setColumnSortable(false);
+                        col.setColumnSortable(true);
                         col.setMinimumColumnWidth(50);
                         col.setMaximumColumnWidth(50);
@@ -94 +94 @@
                         StringColumn<ChemicalAnalysis> col = new StringColumn<ChemicalAnalysis>(enttxt.ChemicalAnalysis_analysisMethod(),
                                         ChemicalAnalysisProperty.analysisMethod);
-                        col.setColumnSortable(false);
+                        col.setColumnSortable(true);
                         col.setMinimumColumnWidth(30);
                         col.setPreferredColumnWidth(30);
@@ -106 +106 @@
                         StringColumn<ChemicalAnalysis> col = new StringColumn<ChemicalAnalysis>(enttxt.ChemicalAnalysis_mineral(),
                                         ChemicalAnalysisProperty.mineral);
-                        col.setColumnSortable(false);
+                        col.setColumnSortable(true);
                         col.setMinimumColumnWidth(30);
                         col.setPreferredColumnWidth(30);
@@ -118 +118 @@
                         StringColumn<ChemicalAnalysis> col = new StringColumn<ChemicalAnalysis>(enttxt.ChemicalAnalysis_location(),
                                         ChemicalAnalysisProperty.location);
-                        col.setColumnSortable(false);
+                        col.setColumnSortable(true);
                         col.setMinimumColumnWidth(30);
                         col.setPreferredColumnWidth(30);
@@ -130 +130 @@
                         StringColumn<ChemicalAnalysis> col = new StringColumn<ChemicalAnalysis>(enttxt.ChemicalAnalysis_analyst(),
                                         ChemicalAnalysisProperty.analyst);
-                        col.setColumnSortable(false);
+                        col.setColumnSortable(true);
                         col.setMinimumColumnWidth(30);
                         col.setPreferredColumnWidth(30);
@@ -142 +142 @@
                         StringColumn<ChemicalAnalysis> col = new StringColumn<ChemicalAnalysis>(enttxt.ChemicalAnalysis_analysisDate(),
                                         ChemicalAnalysisProperty.analysisDate);
-                        col.setColumnSortable(false);
+                        col.setColumnSortable(true);
                         col.setMinimumColumnWidth(30);
                         col.setPreferredColumnWidth(30);
@@ -154 +154 @@
                         StringColumn<ChemicalAnalysis> col = new StringColumn<ChemicalAnalysis>(enttxt.ChemicalAnalysis_reference(),
                                         ChemicalAnalysisProperty.reference);
-                        col.setColumnSortable(false);
+                        col.setColumnSortable(true);
                         col.setMinimumColumnWidth(30);
                         col.setPreferredColumnWidth(30);
@@ -193 +193 @@
                         StringColumn<ChemicalAnalysis> col = new StringColumn<ChemicalAnalysis>(enttxt.ChemicalAnalysis_total(),
                                         ChemicalAnalysisProperty.total);
-                        col.setColumnSortable(false);
+                        col.setColumnSortable(true);
                         col.setMinimumColumnWidth(30);
                         col.setPreferredColumnWidth(30);

trunk/mpdb-server/src/edu/rpi/metpetdb/server/dao/ChemicalAnalysis.hbm.xml

@@ -99 +99 @@
     order by (lower(ma.spotId))
   </query>
+  <query name="ChemicalAnalysis.bySubsampleId/publicData">
+    from ChemicalAnalysis ma
+    where ma.subsample.id = :id
+    order by ma.publicData
+  </query>
   <query name="ChemicalAnalysis.bySubsampleId/analysisMethod">
     from ChemicalAnalysis ma
@@ -104 +109 @@
     order by (lower(ma.analysisMethod))
   </query>
+  <query name="ChemicalAnalysis.bySubsampleId/mineral">
+    from ChemicalAnalysis ma
+    where ma.subsample.id = :id
+    order by (lower(ma.mineral))
+  </query>
   <query name="ChemicalAnalysis.bySubsampleId/location">
     from ChemicalAnalysis ma
     where ma.subsample.id = :id
-    order by (lower(location))
+    order by (lower(ma.location))
   </query>
   <query name="ChemicalAnalysis.bySubsampleId/analyst">
@@ -117 +127 @@
     from ChemicalAnalysis ma
     where ma.subsample.id = :id
-    order by (lower(ma.analysisDate))
+    order by ma.analysisDate
+  </query>
+  <query name="ChemicalAnalysis.bySubsampleId/reference">
+    from ChemicalAnalysis ma
+    where ma.subsample.id = :id
+    order by (lower(ma.reference))
+  </query>
+  <query name="ChemicalAnalysis.bySubsampleId/total">
+    from ChemicalAnalysis ma
+    where ma.subsample.id = :id
+    order by ma.total
   </query>
   <query name="ChemicalAnalysis.bySubsampleId/description">