Skip to content

Commit 55bb9cc

Browse files
committed
1 parent ac6be0c commit 55bb9cc

File tree

3 files changed

+60
-7
lines changed

3 files changed

+60
-7
lines changed

UAMamm.cfm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<cfset setDbUser(1)>
2-
<cflocation url="SpecimenSearch.cfm">
2+
<cflocation url="/SpecimenSearch.cfm">

editAccn.cfm

+59-5
Original file line numberDiff line numberDiff line change
@@ -588,8 +588,16 @@
588588
</tr>
589589
<tr>
590590
<td>
591-
<label for="ent_Date">Entry Date</label>
592-
<input type="text" name="b_ent_date" id="b_ent_date">-<input type="text" name="e_ent_date" id="e_ent_date">
591+
<table cellspacing='0' cellpadding='0'>
592+
<td>
593+
<label for="b_ent_date">Entry Date:</label>
594+
<input type="text" name="b_ent_date" id="b_ent_date">
595+
</td>
596+
<td>
597+
<label for="e_ent_date">Until: (leave blank otherwise)</label>
598+
<input type='text' name='e_ent_date' id='e_ent_date'>
599+
</td>
600+
</table>
593601
</td>
594602
<td colspan=2 nowrap>
595603
<table cellspacing='0' cellpadding='0'>
@@ -821,6 +829,9 @@
821829
<cfquery name="getAccns" datasource="user_login" username="#session.dbuser#" password="#decrypt(session.epw,session.sessionKey)#">
822830
#preservesinglequotes(thisSQL)#
823831
</cfquery>
832+
<cfif not isdefined("csv")>
833+
<cfset csv=false>
834+
</cfif>
824835
<cfif getAccns.recordcount is 0>
825836
Nothing matched your search criteria.
826837
<cfabort>
@@ -836,10 +847,26 @@
836847
View #specs.c# items in these #c.c# Accessions
837848
</a>
838849
</cfif>
850+
<cfset rURL="editAccn.cfm?csv=true">
851+
<cfloop list="#StructKeyList(form)#" index="key">
852+
<cfif len(form[key]) gt 0>
853+
<cfset rURL='#rURL#&#key#=#form[key]#'>
854+
</cfif>
855+
</cfloop>
856+
<br><a href="#rURL#">[ download CSV ]</a>
857+
</cfif>
858+
<cfif csv is true>
859+
<cfset dlFile = "ArctosAccnSearchData.csv">
860+
<cfset variables.fileName="#Application.webDirectory#/download/#dlFile#">
861+
<cfset variables.encoding="UTF-8">
862+
<cfscript>
863+
variables.joFileWriter = createObject('Component', '/component.FileWriter').init(variables.fileName, variables.encoding, 32768);
864+
d='accn_number,accn_status,received_from,received_date,nature_of_material,remarks,estimated_count,entered_by';
865+
variables.joFileWriter.writeLine(d);
866+
</cfscript>
839867
</cfif>
840-
841868
<cfset i=1>
842-
<cfif #project_id# gt 0>
869+
<cfif project_id gt 0>
843870
<cfquery name="sfproj" datasource="user_login" username="#session.dbuser#" password="#decrypt(session.epw,session.sessionKey)#">
844871
select project_name from project where project_id=#project_id#
845872
</cfquery>
@@ -883,8 +910,35 @@
883910
</CFIF>
884911
</div>
885912
</div>
886-
<cfset i=#i#+1>
913+
<cfif csv is true>
914+
<cfset d='"#escapeDoubleQuotes(collection)# #escapeDoubleQuotes(accn_number)#"'>
915+
<cfset d=d &',"#c.c#","#escapeDoubleQuotes(recFromAgent)#"'>
916+
<cfset d=d &',"#c.c#","#escapeDoubleQuotes(accn_status)#"'>
917+
<cfset d=d &',"#DateFormat(received_date, "yyyy-mm-dd")#"'>
918+
<cfset d=d &',"#escapeDoubleQuotes(nature_of_material)#"'>
919+
<cfset d=d &',"#escapeDoubleQuotes(trans_remarks)#"'>
920+
<cfset d=d &',"#escapeDoubleQuotes(estimated_count)#"'>
921+
<cfset d=d &',"#escapeDoubleQuotes(entAgent)#"'>
922+
<cfscript>
923+
variables.joFileWriter.writeLine(d);
924+
</cfscript>
925+
</cfif>
926+
<cfset i=i+1>
887927
</cfoutput>
928+
929+
930+
931+
<cfif csv is true>
932+
<cfscript>
933+
variables.joFileWriter.close();
934+
</cfscript>
935+
<cfoutput>
936+
<cflocation url="/download.cfm?file=#dlFile#" addtoken="false">
937+
</cfoutput>
938+
</cfif>
939+
940+
941+
888942
</cfif>
889943
<!------------------------------------------------------------------------------------------->
890944
<cfif #action# is "delePermit">

login.cfm

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<CFIF action is "signIn">
5959
<cfoutput>
6060
<cfset initSession('#username#','#password#')>
61-
6261
<cfif len(session.username) is 0>
6362
<cfset u="login.cfm?badPW=true&username=#username#">
6463
<cfif isdefined("gotopage")>

0 commit comments

Comments
 (0)