076 computation debug and optimization

contragent.cfm

@@ -174,7 +174,7 @@
 			,siv.version
 			,siv.name_version
 			,siv.date_accept
-			,siv.__index
+			,siv.__index as siv_index
 			,siv.date_nop
 			,siv.date_end
 			,siv.is_easy
@@ -189,7 +189,7 @@
 			,p.__id as p_uid
 			,p.name
 			,s.probability_pc
-			,d.__index
+			,d.__index as deal_index
 			,d.__id as deal_uid
 			,siv.end_customer as end_customer_uid
 			,z.id_klienta as end_customer_wz
@@ -204,7 +204,7 @@
 			AND siv.is_actual
 			--AND a.is_actual
 			AND s.probability_pc > 0
-			order by version::int
+			order by d.__index, siv.__index, p.__id, version::int
 		</cfquery>
 		
 		<cfoutput>
@@ -215,7 +215,7 @@
 		 <table class="worktable">	
 			<thead>	
 				<tr>
-					<th>__index</th>
+					<th>deal index</th>
 					<!--- <th>__name</th> --->
 					<th width="20%">user description</th>
 					<th width="25%">Компоненты</th>
@@ -229,9 +229,9 @@
 					<th>version</th>
 					<th>name version</th>
 					<th>date accept</th>
-					<th>__index</th>
-					<th width="5%">date nop</th>
-					<th width="5%">date end</th>
+					<th>line version index</th>
+					<th width="5%">НОУ</th>
+					<th width="5%">КОУ</th>
 					<th>is easy</th>		
 					<th width="2%">Вер.%</th>						
 					<th width="10%">Дополнительное соглашение</th>
@@ -239,9 +239,9 @@
 				</tr>
 			</thead>
 			
-			<cfoutput query="qService" group="__index">
+			<cfoutput query="qService" group="deal_index"> <!--- не оч понятно, какой из индексов брать --->
 				<tr>
-					<td class="c"><a href="deal_service.cfm?__id=#__id#&#tr.fwx#" title="__id">#__index#</a></td>
+					<td class="c"><a href="deal_service.cfm?__id=#__id#&#tr.fwx#" title="__id">#deal_index#</a></td>
 					<!--- <td class="c">#__name#</td> --->
 					<td class="l">#user_description#</td>
 					<td>
@@ -278,7 +278,7 @@
 					<td class="c">#version#</td>
 					<td class="c">#name_version#</td>
 					<td class="c">#date_accept#</td>
-					<td class="c">#__index#</td>
+					<td class="c">#siv_index#</td>
 					<td class="c">#dateFormat(date_nop,'YYYY-MM-DD')#</td>
 					<td class="c<cfif isDate(date_end) AND date_end LT Now()> err</cfif>">#dateFormat(date_end,'YYYY-MM-DD')#</td>					
 					<td class="c">#is_easy#</td>