Add numeric value column to extra vars, and add option to mark extra var as sortable #2604 #2559

modules/document/queries/getDocumentExtraKeys.xml

@@ -10,6 +10,7 @@
         <column name="var_is_required" alias="is_required" />
         <column name="var_is_strict" alias="is_strict" />
         <column name="var_search" alias="search" />
+        <column name="var_sort" alias="sort" />
         <column name="var_default" alias="default" />
         <column name="var_options" alias="options" />
         <column name="var_desc" alias="desc" />

modules/document/queries/getDocumentNumericExtraKeys.xml

@@ -0,0 +1,13 @@
+<query id="getDocumentNumericExtraKeys" action="select">
+	<tables>
+		<table name="document_extra_keys" />
+	</tables>
+	<columns>
+		<column name="module_srl" />
+		<column name="var_idx" />
+		<column name="var_type" />
+	</columns>
+	<conditions>
+		<condition operation="in" column="var_type" var="var_type" />
+	</conditions>
+</query>

modules/document/queries/insertDocumentExtraKey.xml

@@ -10,6 +10,7 @@
 		<column name="var_is_required" var="var_is_required" default="N" notnull="notnull" />
 		<column name="var_is_strict" var="var_is_strict" default="N" notnull="notnull" />
 		<column name="var_search" var="var_search" default="N" notnull="notnull" />
+		<column name="var_sort" var="var_sort" default="N" notnull="notnull" />
 		<column name="var_default" var="var_default" />
 		<column name="var_options" var="var_options" />
 		<column name="var_desc" var="var_desc" />

modules/document/queries/insertDocumentExtraVar.xml

@@ -7,6 +7,7 @@
         <column name="document_srl" var="document_srl" filter="number" notnull="notnull" />
         <column name="var_idx" var="var_idx" filter="number" notnull="notnull" />
         <column name="value" var="value" notnull="notnull" />
+		<column name="sort_value" var="sort_value" />
         <column name="lang_code" var="lang_code" />
         <column name="eid" var="eid" notnull="notnull" />
     </columns>

modules/document/queries/updateDocumentExtraKey.xml

@@ -8,6 +8,7 @@
 		<column name="var_is_required" var="var_is_required" default="N" notnull="notnull" />
 		<column name="var_is_strict" var="var_is_strict" default="N" notnull="notnull" />
 		<column name="var_search" var="var_search" default="N" notnull="notnull" />
+		<column name="var_sort" var="var_sort" default="N" notnull="notnull" />
 		<column name="var_default" var="var_default" default="" />
 		<column name="var_options" var="var_options" default="" />
 		<column name="var_desc" var="var_desc" />

modules/document/queries/updateDocumentExtraVar.xml

@@ -4,6 +4,7 @@
     </tables>
     <columns>
         <column name="value" var="value" />
+		<column name="sort_value" var="sort_value" />
         <column name="lang_code" var="lang_code" />
         <column name="eid" var="eid" />
     </columns>

modules/document/queries/updateDocumentExtraVarSortValue.xml

@@ -0,0 +1,12 @@
+<query id="updateDocumentExtraVarSortValue" action="update">
+	<tables>
+		<table name="document_extra_vars" />
+	</tables>
+	<columns>
+		<column name="sort_value" default="CAST(value AS UNSIGNED)" />
+	</columns>
+	<conditions>
+		<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+		<condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" />
+	</conditions>
+</query>