smishchuk/spec
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

017 formatting

Browse Source
This commit is contained in:
msyu 2025-06-25 16:48:18 +03:00
parent 6443e62b5e
commit a4f66bf6e8
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Application.cfc
View File

@ -69,7 +69,7 @@
<!--- <cfset this.datasources["#this.datasource#"]=getDS("#this.datasource#","datasource_#this.datasource#")/> --->
<cfset request.RECORDS_PER_PAGE=500/>
<cfset request.APP_VERSION="0.00.016"/>
<cfset request.APP_VERSION="0.00.017"/>
<cflock scope="application" type="readonly" timeout=3>
<cfset request.APP_NAME=this.Name/>

19
income_data.cfm
View File

@ -10,6 +10,15 @@
<cfreturn (a GT 0)? a : ""/>
</cffunction>
<cffunction name="_nFmt">
<cfargument name="n"/>
<cfif n EQ 0 OR !isNumeric(n)>
<cfreturn "">
<cfelse>
<cfreturn replace(NumberFormat(n, ",.00"), ",", "&nbsp;", "ALL")/>
</cfif>
</cffunction>
<m:prepare_ls entity="specification_item" accessObject="" pageInfoOut="pageInfo" trackOut="tr"/>
<!--- <m:filter_settings target="#pageInfo.entity#_ls">
@ -206,19 +215,19 @@ select count(*) as cnt from specification_item where 1=1
<td class="r">#probability_perc#</td>
<!--- <td class="r">#agreement_version#</td> --->
<td class="r"><a href="agreement.cfm?contract_id=#contract_id#&agreement_version=#agreement_version#&#tr.fwx#">#agreement_version#</a></td>
<td class="r">#nFmt(install)#</td>
<td class="r">#nFmt(recurring)#</td>
<td class="r">#_nFmt(install)#</td>
<td class="r">#_nFmt(recurring)#</td>
<td class="c">#dateFormat(dt_from_prev,"DD.MM.YYYY")#</td>
<td class="c">#dateFormat(dt_to_prev,"DD.MM.YYYY")#</td>
<td class="r">#probability_perc_prev#</td>
<td class="r"><a href="agreement.cfm?contract_id=#contract_id#&agreement_version=#agreement_version_prev#&#tr.fwx#">#agreement_version_prev#</a></td>
<td class="r">#nFmt(install_prev)#</td>
<td class="r">#nFmt(recurring_prev)#</td>
<td class="r">#_nFmt(install_prev)#</td>
<td class="r">#_nFmt(recurring_prev)#</td>
<td class="r">#svc#</td>
<td class="r">#quantity#</td>
<td class="r">#nFmt(price)#</td>
<td class="r">#_nFmt(price)#</td>
<td class="r">#specification#</td>
<td class="r">#contract#</td>
<td class="r">#dateFormat(dt_contract,'DD.MM.YYYY')#</td>