nmrshiftdb-devel Mailing List for NMRShiftDB (Page 3)
Brought to you by:
steinbeck
Menu
▾
▴
nmrshiftdb-devel — For developers of the NMRShiftDB software and admins of an NMRShiftDB node
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
(170) |
Mar
(120) |
Apr
(191) |
May
(231) |
Jun
(147) |
Jul
(202) |
Aug
(132) |
Sep
(91) |
Oct
(43) |
Nov
(87) |
Dec
(75) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(111) |
Feb
(194) |
Mar
(102) |
Apr
(107) |
May
(88) |
Jun
(121) |
Jul
(166) |
Aug
(75) |
Sep
(89) |
Oct
(116) |
Nov
(117) |
Dec
(52) |
| 2004 |
Jan
(138) |
Feb
(150) |
Mar
(144) |
Apr
(144) |
May
(54) |
Jun
(116) |
Jul
(73) |
Aug
(29) |
Sep
(135) |
Oct
(96) |
Nov
(72) |
Dec
(28) |
| 2005 |
Jan
(32) |
Feb
(9) |
Mar
(69) |
Apr
(108) |
May
(130) |
Jun
(195) |
Jul
(104) |
Aug
(116) |
Sep
(106) |
Oct
(58) |
Nov
(74) |
Dec
(64) |
| 2006 |
Jan
(110) |
Feb
(63) |
Mar
(45) |
Apr
(11) |
May
(122) |
Jun
(106) |
Jul
(26) |
Aug
(48) |
Sep
(67) |
Oct
(105) |
Nov
(81) |
Dec
(6) |
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(9) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(11) |
| 2010 |
Jan
(1) |
Feb
|
Mar
|
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Stefan K. <sh...@us...> - 2006-11-20 14:12:48
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25935/src/vmtemplates/portlets/html Modified Files: user-order.vm Log Message: resetting of solvent field in ordersubmit working Index: user-order.vm =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html/user-order.vm,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -r1.51 -r1.52 *** user-order.vm 19 Nov 2006 16:29:33 -0000 1.51 --- user-order.vm 20 Nov 2006 14:12:45 -0000 1.52 *************** *** 135,140 **** : $sample.getDBCondition().getValue() #else ! (enter or choose): <input type="text" name="solvent" size="15" value="$!solvent"> ! <select name="solvents" size="1" onChange="document.restform.elements['solvent'].value=''"> #foreach($existingcondition in $solvents) <option value="$existingcondition.getConditionId()">$existingcondition.getValue()</option> --- 135,140 ---- : $sample.getDBCondition().getValue() #else ! (enter or choose): <input type="text" name="solvent" id="solvent" size="15" value="$!solvent"> ! <select name="solvents" size="1" onChange="document.getElementById('solvent').value=''"> #foreach($existingcondition in $solvents) <option value="$existingcondition.getConditionId()">$existingcondition.getValue()</option> |
|
From: Stefan K. <sh...@us...> - 2006-11-20 14:12:48
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25935/src/java/org/openscience/nmrshiftdb/modules/actions/portlets Modified Files: OrderAction.java Log Message: resetting of solvent field in ordersubmit working Index: OrderAction.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderAction.java,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -r1.44 -r1.45 *** OrderAction.java 19 Nov 2006 16:29:33 -0000 1.44 --- OrderAction.java 20 Nov 2006 14:12:45 -0000 1.45 *************** *** 270,275 **** context.put("usersidcomment", data.getParameters().getString("usersidcomment","")); context.put("ordertype", data.getParameters().getString("process","")); ! if(data.getParameters().getString("probablestructure")!=null){ ! System.err.println("im "+data.getParameters().getString("probablestructure")); String filename="/nmrshiftdbhtml/" + System.currentTimeMillis() + "userorder.jpg"; GeneralUtils.makeJpg(data.getParameters().getString("probablestructure",""),filename,data.getServletConfig(),200,200,false); --- 270,274 ---- context.put("usersidcomment", data.getParameters().getString("usersidcomment","")); context.put("ordertype", data.getParameters().getString("process","")); ! if(data.getParameters().getString("probablestructure")!=null || data.getParameters().getString("probablestructure").equals("")){ String filename="/nmrshiftdbhtml/" + System.currentTimeMillis() + "userorder.jpg"; GeneralUtils.makeJpg(data.getParameters().getString("probablestructure",""),filename,data.getServletConfig(),200,200,false); |
|
From: Stefan K. <sh...@us...> - 2006-11-20 14:12:48
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/portlets In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25935/src/java/org/openscience/nmrshiftdb/portlets Modified Files: ResultPortlet.java Log Message: resetting of solvent field in ordersubmit working Index: ResultPortlet.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/portlets/ResultPortlet.java,v retrieving revision 1.288 retrieving revision 1.289 diff -C2 -r1.288 -r1.289 *** ResultPortlet.java 19 Nov 2006 16:29:33 -0000 1.288 --- ResultPortlet.java 20 Nov 2006 14:12:45 -0000 1.289 *************** *** 122,126 **** ex.printStackTrace(); } ! return(new StringElement("<head><meta HTTP-EQUIV=\"REFRESH\" content=\"0; url=NMR+lab+administration;jsessionid="+runData.getSession().getId()+"?submitorshow=submit&other="+runData.getParameters().getString("other", "")+"&othernuc="+runData.getParameters().getString("othernuc","")+"&care="+runData.getParameters().getString("care","")+"&type="+URLEncoder.encode(runData.getParameters().getString("type",""))+"&strength="+runData.getParameters().getString("machine","")+"&solvent="+runData.getParameters().getString("solvent","")+"&usersid="+runData.getParameters().getString("usersid","")+"&usersidcomment="+runData.getParameters().getString("usersidcomment","")+"&process="+runData.getParameters().getString("process","")+"&probablestructure="+URLEncoder.encode(runData.getParameters().getString("probablestructure",""))+"\"></head><a href=\"\">If you are not redirected, please click here</a>")); } //The molecule displaying starts with 0 if new search --- 122,126 ---- ex.printStackTrace(); } ! return(new StringElement("<head><meta HTTP-EQUIV=\"REFRESH\" content=\"0; url=NMR+lab+administration;jsessionid="+runData.getSession().getId()+"?submitorshow=submit&other="+URLEncoder.encode(runData.getParameters().getString("other", ""))+"&othernuc="+URLEncoder.encode(runData.getParameters().getString("othernuc",""))+"&care="+URLEncoder.encode(runData.getParameters().getString("care",""))+"&type="+URLEncoder.encode(runData.getParameters().getString("type",""))+"&strength="+URLEncoder.encode(runData.getParameters().getString("machine",""))+"&solvent="+URLEncoder.encode(runData.getParameters().getString("solvent",""))+"&usersid="+URLEncoder.encode(runData.getParameters().getString("usersid",""))+"&usersidcomment="+URLEncoder.encode(runData.getParameters().getString("usersidcomment",""))+"&process="+URLEncoder.encode(runData.getParameters().getString("process",""))+"&probablestructure="+URLEncoder.encode(runData.getParameters().getString("probablestructure",""))+"\"></head><a href=\"\">If you are not redirected, please click here</a>")); } //The molecule displaying starts with 0 if new search |
|
From: Stefan K. <sh...@us...> - 2006-11-19 16:29:46
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21747/src/java/org/openscience/nmrshiftdb Modified Files: NmrshiftdbServlet.java Log Message: added the link for lab journal Index: NmrshiftdbServlet.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/NmrshiftdbServlet.java,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -r1.100 -r1.101 *** NmrshiftdbServlet.java 18 Nov 2006 17:03:12 -0000 1.100 --- NmrshiftdbServlet.java 19 Nov 2006 16:29:32 -0000 1.101 *************** *** 209,213 **** monthend=Integer.parseInt(req.getParameter("monthend")); } ! JasperReport jasperReport = (JasperReport)JRLoader.loadObject(relativepath+"/reports/"+(yearly ? "yearly" : "monthly")+"_report_1.jasper"); //Second, create a map of parameters to pass to the report. Map parameters = new HashMap(); --- 209,213 ---- monthend=Integer.parseInt(req.getParameter("monthend")); } ! JasperReport jasperReport = (JasperReport)JRLoader.loadObject(relativepath+"/reports/"+(yearly ? "yearly" : "monthly")+"_report_"+req.getParameter("type")+".jasper"); //Second, create a map of parameters to pass to the report. Map parameters = new HashMap(); |
|
From: Stefan K. <sh...@us...> - 2006-11-19 16:29:46
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21747/src/vmtemplates/portlets/html Modified Files: user-order.vm Log Message: added the link for lab journal Index: user-order.vm =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html/user-order.vm,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -r1.50 -r1.51 *** user-order.vm 18 Nov 2006 18:38:15 -0000 1.50 --- user-order.vm 19 Nov 2006 16:29:33 -0000 1.51 *************** *** 127,131 **** #end Name: $data.getUser().getFirstName() $data.getUser().getLastName()<br> ! Institure/Workgroup: $data.getUser().getAffiliation1()/$data.getUser().getAffiliation2()<br> Sample I. D.: #if($submitorshow=="submit")<input name="sampleid" type="text" size="30" value="$!usersid"> (keyword for personal use: <input name="sampleidcomment" type="text" size="30" value="$!usersidcomment">)#else $sample.getUsersId() (personal keyword: $sample.getUsersIdComment()) #end <br> Date: $date<br> --- 127,131 ---- #end Name: $data.getUser().getFirstName() $data.getUser().getLastName()<br> ! Institute/Workgroup: $data.getUser().getAffiliation1()/$data.getUser().getAffiliation2()<br> Sample I. D.: #if($submitorshow=="submit")<input name="sampleid" type="text" size="30" value="$!usersid"> (keyword for personal use: <input name="sampleidcomment" type="text" size="30" value="$!usersidcomment">)#else $sample.getUsersId() (personal keyword: $sample.getUsersIdComment()) #end <br> Date: $date<br> *************** *** 206,212 **** <input type="button" style="font-size:smaller" value="Import from structures history" onClick="openStructureHistory()"> #else ! <input type="hidden" id="applet" name="applet" value=""/> ! <input #if($submitorshow=="edit") name="eventSubmit_doEditsubmitorder" #else name="eventSubmit_doSubmitorder" #end type="image" src="images/java.png" style="color:white" alt="Switch to Java-mode" onClick="document.getElementById('applet').value='applet';exportMol();"><br><br> ! Choose a structure file for the probable structure: <input type="file" name="datei" size="40"> #end #end --- 206,217 ---- <input type="button" style="font-size:smaller" value="Import from structures history" onClick="openStructureHistory()"> #else ! #if($imagefile=="none") ! <input type="hidden" id="applet" name="applet" value=""/> ! <input #if($submitorshow=="edit") name="eventSubmit_doEditsubmitorder" #else name="eventSubmit_doSubmitorder" #end type="image" src="images/java.png" style="color:white" alt="Switch to Java-mode" onClick="document.getElementById('applet').value='applet';exportMol();"><br><br> ! Choose a structure file for the probable structure: <input type="file" name="datei" size="40"> ! #else ! <img src="$imagefile" alt="the structure you entered should be here"> ! <input type="hidden" name="urlmol" value="$urlmol"> ! #end #end #end *************** *** 216,220 **** : $sample.getDBMachine().getName() ($sample.getDBMachine().getDBCondition().getValue() Mhz) #else ! : <select name="fstrengths" size="1" onChange="document.restform.elements['fstrength'].value=''"> #foreach($existingcondition in $fstrengths) <option value="$existingcondition.getMachineId()" #if($strength==$existingcondition.getMachineId()) selected #end>$existingcondition.getName() ($existingcondition.getDBCondition().getValue() Mhz)</option> --- 221,225 ---- : $sample.getDBMachine().getName() ($sample.getDBMachine().getDBCondition().getValue() Mhz) #else ! : <select name="fstrengths" size="1"> #foreach($existingcondition in $fstrengths) <option value="$existingcondition.getMachineId()" #if($strength==$existingcondition.getMachineId()) selected #end>$existingcondition.getName() ($existingcondition.getDBCondition().getValue() Mhz)</option> |
|
From: Stefan K. <sh...@us...> - 2006-11-19 16:29:45
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/portlets In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21747/src/java/org/openscience/nmrshiftdb/portlets Modified Files: ResultPortlet.java Log Message: added the link for lab journal Index: ResultPortlet.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/portlets/ResultPortlet.java,v retrieving revision 1.287 retrieving revision 1.288 diff -C2 -r1.287 -r1.288 *** ResultPortlet.java 10 Nov 2006 14:14:06 -0000 1.287 --- ResultPortlet.java 19 Nov 2006 16:29:33 -0000 1.288 *************** *** 3,6 **** --- 3,7 ---- import java.io.StringReader; import java.io.StringWriter; + import java.net.URLEncoder; import java.text.DecimalFormat; import java.text.FieldPosition; *************** *** 22,27 **** import org.apache.turbine.modules.ActionLoader; import org.apache.turbine.om.NumberKey; - import org.apache.turbine.om.security.User; - import org.apache.turbine.services.security.TurbineSecurity; import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; --- 23,26 ---- *************** *** 123,127 **** ex.printStackTrace(); } ! return(new StringElement("<head><meta HTTP-EQUIV=\"REFRESH\" content=\"0; url=http://127.0.0.1:8080/portal/pane0/Results;jsessionid="+runData.getSession().getId()+"\"></head><a href=\"\">If you are not redirected, please click here</a>")); } //The molecule displaying starts with 0 if new search --- 122,126 ---- ex.printStackTrace(); } ! return(new StringElement("<head><meta HTTP-EQUIV=\"REFRESH\" content=\"0; url=NMR+lab+administration;jsessionid="+runData.getSession().getId()+"?submitorshow=submit&other="+runData.getParameters().getString("other", "")+"&othernuc="+runData.getParameters().getString("othernuc","")+"&care="+runData.getParameters().getString("care","")+"&type="+URLEncoder.encode(runData.getParameters().getString("type",""))+"&strength="+runData.getParameters().getString("machine","")+"&solvent="+runData.getParameters().getString("solvent","")+"&usersid="+runData.getParameters().getString("usersid","")+"&usersidcomment="+runData.getParameters().getString("usersidcomment","")+"&process="+runData.getParameters().getString("process","")+"&probablestructure="+URLEncoder.encode(runData.getParameters().getString("probablestructure",""))+"\"></head><a href=\"\">If you are not redirected, please click here</a>")); } //The molecule displaying starts with 0 if new search |
|
From: Stefan K. <sh...@us...> - 2006-11-19 16:29:39
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/util In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21747/src/java/org/openscience/nmrshiftdb/util Modified Files: UrlTool.java Log Message: added the link for lab journal Index: UrlTool.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/util/UrlTool.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** UrlTool.java 18 Nov 2006 17:03:12 -0000 1.20 --- UrlTool.java 19 Nov 2006 16:29:33 -0000 1.21 *************** *** 264,269 **** Vector v=BasePeer.executeQuery("select distinct AFFILIATION_2 from TURBINE_USER where LABGROUP>0"); Vector v2=new Vector(); for(int i=0;i<v.size();i++){ - v2.add(""); v2.add(((Record)v.get(i)).getValue(1).asString()); } --- 264,269 ---- Vector v=BasePeer.executeQuery("select distinct AFFILIATION_2 from TURBINE_USER where LABGROUP>0"); Vector v2=new Vector(); + v2.add(""); for(int i=0;i<v.size();i++){ v2.add(((Record)v.get(i)).getValue(1).asString()); } |
|
From: Stefan K. <sh...@us...> - 2006-11-19 16:29:36
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21747/src/java/org/openscience/nmrshiftdb/modules/actions/portlets Modified Files: OrderAction.java Log Message: added the link for lab journal Index: OrderAction.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderAction.java,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -r1.43 -r1.44 *** OrderAction.java 18 Nov 2006 18:38:14 -0000 1.43 --- OrderAction.java 19 Nov 2006 16:29:33 -0000 1.44 *************** *** 260,263 **** --- 260,282 ---- context.put("fstrengths", DBMachinePeer.doSelect(new Criteria())); context.put("data",data); + //this is for the submit from url + context.put("other", data.getParameters().getString("other","")); + context.put("othernuc", data.getParameters().getString("othernuc","")); + context.put("care", data.getParameters().getString("care","")); + context.put("strength", ""+data.getParameters().getString("strength","")); + context.put("solvent", data.getParameters().getString("solvent","")); + context.put("nuclei", data.getParameters().getString("type","")); + context.put("usersid", data.getParameters().getString("usersid","")); + context.put("usersidcomment", data.getParameters().getString("usersidcomment","")); + context.put("ordertype", data.getParameters().getString("process","")); + if(data.getParameters().getString("probablestructure")!=null){ + System.err.println("im "+data.getParameters().getString("probablestructure")); + String filename="/nmrshiftdbhtml/" + System.currentTimeMillis() + "userorder.jpg"; + GeneralUtils.makeJpg(data.getParameters().getString("probablestructure",""),filename,data.getServletConfig(),200,200,false); + context.put("imagefile",filename); + context.put("urlmol",data.getParameters().getString("probablestructure")); + }else{ + context.put("imagefile", "none"); + } } context.put("typesc",getTypesC()); *************** *** 344,348 **** } }else{ ! if(data.getRequest().getContentType()!=null && data.getRequest().getContentType().indexOf("multipart/form-data")>-1){ FileItem[] fi = data.getParameters().getFileItems("datei"); if(fi!=null){ --- 363,374 ---- } }else{ ! if(data.getParameters().get("urlmol")!=null){ ! String molecule = data.getParameters().get("urlmol"); ! mol = (Molecule) new MDLReader(new StringReader(molecule)).read(new Molecule()); ! if(mol!= null && mol.getAtomCount()>0){ ! SubmittingData sd=new SubmittingData(ServletUtils.expandRelative(data.getServletConfig(), "/WEB-INF/conf/normalizer.xml")); ! sample.setProbableStructure(sd.saveMoleculeOnly(molecule, data, (NmrshiftdbUser)data.getUser())); ! } ! }else if(data.getRequest().getContentType()!=null && data.getRequest().getContentType().indexOf("multipart/form-data")>-1){ FileItem[] fi = data.getParameters().getFileItems("datei"); if(fi!=null){ |
|
From: Stefan K. <sh...@us...> - 2006-11-18 18:38:16
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13519/src/vmtemplates/portlets/html Modified Files: user-order.vm worker-order.vm Log Message: all changes needed for the reports done Index: user-order.vm =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html/user-order.vm,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -r1.49 -r1.50 *** user-order.vm 6 Nov 2006 13:40:09 -0000 1.49 --- user-order.vm 18 Nov 2006 18:38:15 -0000 1.50 *************** *** 127,131 **** #end Name: $data.getUser().getFirstName() $data.getUser().getLastName()<br> ! Workgroup: $data.getUser().getAffiliation()<br> Sample I. D.: #if($submitorshow=="submit")<input name="sampleid" type="text" size="30" value="$!usersid"> (keyword for personal use: <input name="sampleidcomment" type="text" size="30" value="$!usersidcomment">)#else $sample.getUsersId() (personal keyword: $sample.getUsersIdComment()) #end <br> Date: $date<br> --- 127,131 ---- #end Name: $data.getUser().getFirstName() $data.getUser().getLastName()<br> ! Institure/Workgroup: $data.getUser().getAffiliation1()/$data.getUser().getAffiliation2()<br> Sample I. D.: #if($submitorshow=="submit")<input name="sampleid" type="text" size="30" value="$!usersid"> (keyword for personal use: <input name="sampleidcomment" type="text" size="30" value="$!usersidcomment">)#else $sample.getUsersId() (personal keyword: $sample.getUsersIdComment()) #end <br> Date: $date<br> *************** *** 229,233 **** Spectrum types #if($submitorshow=="show") ! : $sample.getWishedSpectrum() #else <br> --- 229,233 ---- Spectrum types #if($submitorshow=="show") ! : $sample.getWishedSpectrum() $sample.getOtherWishedSpectrum() #else <br> Index: worker-order.vm =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html/worker-order.vm,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** worker-order.vm 18 Nov 2006 17:03:13 -0000 1.25 --- worker-order.vm 18 Nov 2006 18:38:15 -0000 1.26 *************** *** 32,36 **** Order $sample.getUsersId() has the following properties:<br> Name: $sample.getNmrshiftdbUser().getFirstName() $sample.getNmrshiftdbUser().getLastName()<br> ! Workgroup: $sample.getNmrshiftdbUser().getAffiliation()<br> Sample I. D.: $sample.getUsersId()<br> Date: $date<br> --- 32,36 ---- Order $sample.getUsersId() has the following properties:<br> Name: $sample.getNmrshiftdbUser().getFirstName() $sample.getNmrshiftdbUser().getLastName()<br> ! Institute/Workgroup: $sample.getNmrshiftdbUser().getAffiliation1()/$sample.getNmrshiftdbUser().getAffiliation2()<br> Sample I. D.: $sample.getUsersId()<br> Date: $date<br> *************** *** 40,44 **** #end Spectrometer: $sample.getDBMachine().getName() ($sample.getDBMachine().getDBCondition().getValue() Mhz)<br> ! $sample.getWishedSpectrum()<br> Other nuclei (please specify): $sample.getOtherNuclei()<br> Special care for sample: $sample.getSpecialCare()<br> --- 40,44 ---- #end Spectrometer: $sample.getDBMachine().getName() ($sample.getDBMachine().getDBCondition().getValue() Mhz)<br> ! $sample.getWishedSpectrum() $sample.getOtherWishedSpectrum()<br> Other nuclei (please specify): $sample.getOtherNuclei()<br> Special care for sample: $sample.getSpecialCare()<br> |
|
From: Stefan K. <sh...@us...> - 2006-11-18 18:38:16
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13519/src/java/org/openscience/nmrshiftdb/om Modified Files: BaseDBSample.java BaseDBSamplePeer.java Log Message: all changes needed for the reports done Index: BaseDBSample.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/BaseDBSample.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** BaseDBSample.java 17 Nov 2006 20:18:09 -0000 1.10 --- BaseDBSample.java 18 Nov 2006 18:38:14 -0000 1.11 *************** *** 443,447 **** ! if ( !ObjectUtils.equals(this.wished_spectrum, v) ) { this.other_wished_spectrum = v; --- 443,447 ---- ! if ( !ObjectUtils.equals(this.other_wished_spectrum, v) ) { this.other_wished_spectrum = v; Index: BaseDBSamplePeer.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/BaseDBSamplePeer.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** BaseDBSamplePeer.java 17 Nov 2006 20:18:09 -0000 1.9 --- BaseDBSamplePeer.java 18 Nov 2006 18:38:15 -0000 1.10 *************** *** 429,433 **** criteria.add( SPECIAL_CARE, obj.getSpecialCare() ); criteria.add( WISHED_SPECTRUM, obj.getWishedSpectrum() ); ! criteria.add( OTHER_WISHED_SPECTRUM, obj.getWishedSpectrum() ); criteria.add( FINISHED, obj.getFinished() ); criteria.add( PROCESS, obj.getProcess() ); --- 429,433 ---- criteria.add( SPECIAL_CARE, obj.getSpecialCare() ); criteria.add( WISHED_SPECTRUM, obj.getWishedSpectrum() ); ! criteria.add( OTHER_WISHED_SPECTRUM, obj.getOtherWishedSpectrum() ); criteria.add( FINISHED, obj.getFinished() ); criteria.add( PROCESS, obj.getProcess() ); |
|
From: Stefan K. <sh...@us...> - 2006-11-18 18:38:16
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/doc In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13519/doc Modified Files: nmrshiftdb-schema.xml turbine-schema.xml Log Message: all changes needed for the reports done Index: nmrshiftdb-schema.xml =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/doc/nmrshiftdb-schema.xml,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -r1.79 -r1.80 *** nmrshiftdb-schema.xml 8 May 2006 09:46:50 -0000 1.79 --- nmrshiftdb-schema.xml 18 Nov 2006 18:38:14 -0000 1.80 *************** *** 654,657 **** --- 654,658 ---- <column name="SPECIAL_CARE" required="true" type="VARCHAR" size="50"/> <column name="WISHED_SPECTRUM" required="true" type="VARCHAR" size="50"/> + <column name="OTHER_WISHED_SPECTRUM" required="true" type="VARCHAR" size="50"/> <column name="FINISHED" required="true" type="VARCHAR" size="8"/> <index name="USER_ID_INDEX"> Index: turbine-schema.xml =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/doc/turbine-schema.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** turbine-schema.xml 14 Jun 2005 15:34:57 -0000 1.12 --- turbine-schema.xml 18 Nov 2006 18:38:14 -0000 1.13 *************** *** 78,82 **** <column name="COUNTRY" required="true" size="99" type="VARCHAR"/> <column name="WEB_PAGE" size="99" type="VARCHAR"/> ! <column name="AFFILIATION" size="99" type="VARCHAR"/> <column name="EMAIL" required="true" size="99" type="VARCHAR"/> <column name="CONFIRM_VALUE" size="99" type="VARCHAR"/> --- 78,83 ---- <column name="COUNTRY" required="true" size="99" type="VARCHAR"/> <column name="WEB_PAGE" size="99" type="VARCHAR"/> ! <column name="AFFILIATION_1" size="99" type="VARCHAR"/> ! <column name="AFFILIATION_2" size="99" type="VARCHAR"/> <column name="EMAIL" required="true" size="99" type="VARCHAR"/> <column name="CONFIRM_VALUE" size="99" type="VARCHAR"/> |
|
From: Stefan K. <sh...@us...> - 2006-11-18 18:38:16
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13519/src/java/org/openscience/nmrshiftdb/modules/actions/portlets Modified Files: OrderAction.java Log Message: all changes needed for the reports done Index: OrderAction.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderAction.java,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -r1.42 -r1.43 *** OrderAction.java 18 Nov 2006 17:03:12 -0000 1.42 --- OrderAction.java 18 Nov 2006 18:38:14 -0000 1.43 *************** *** 233,237 **** context.put("usersid",toshow.getUsersId()); context.put("solvent", toshow.getDBCondition().getValue()); ! context.put("other",toshow.getWishedSpectrum()); context.put("othernuc",toshow.getOtherNuclei()); context.put("care",toshow.getSpecialCare()); --- 233,237 ---- context.put("usersid",toshow.getUsersId()); context.put("solvent", toshow.getDBCondition().getValue()); ! context.put("other",toshow.getOtherWishedSpectrum()); context.put("othernuc",toshow.getOtherNuclei()); context.put("care",toshow.getSpecialCare()); *************** *** 260,266 **** context.put("fstrengths", DBMachinePeer.doSelect(new Criteria())); context.put("data",data); - context.put("typesc",getTypesC()); - context.put("typesh",getTypesH()); } Vector days=new Vector(); for (int i=1;i<32;i++){ --- 260,266 ---- context.put("fstrengths", DBMachinePeer.doSelect(new Criteria())); context.put("data",data); } + context.put("typesc",getTypesC()); + context.put("typesh",getTypesH()); Vector days=new Vector(); for (int i=1;i<32;i++){ *************** *** 377,383 **** } String wishedSpectrum=""; - if(data.getParameters().get("othertext")!=null && !data.getParameters().get("othertext").equals("")){ - wishedSpectrum+=data.getParameters().get("othertext")+", "; - } Vector v=new Vector(); v.addAll(getTypesC()); --- 377,380 ---- *************** *** 390,397 **** } sample.setWishedSpectrum(wishedSpectrum); Criteria crit2=new Criteria(); crit2.add(DBSamplePeer.USERS_ID,sample.getUsersId()); Vector oldsamples=DBSamplePeer.doSelect(crit2); ! if(wishedSpectrum.equals("") && sample.getOtherNuclei().equals("")){ message+="You did not enter a spectrum type!"; }else if(oldsamples.size()>0){ --- 387,397 ---- } sample.setWishedSpectrum(wishedSpectrum); + if(data.getParameters().get("othertext")!=null && !data.getParameters().get("othertext").equals("")){ + sample.setOtherWishedSpectrum(data.getParameters().get("othertext")); + } Criteria crit2=new Criteria(); crit2.add(DBSamplePeer.USERS_ID,sample.getUsersId()); Vector oldsamples=DBSamplePeer.doSelect(crit2); ! if(wishedSpectrum.equals("") && sample.getOtherNuclei().equals("") && sample.getOtherNuclei().equals("")){ message+="You did not enter a spectrum type!"; }else if(oldsamples.size()>0){ *************** *** 410,414 **** context.put("usersidcomment",data.getParameters().get("sampleidcomment")); context.put("solvent", solvent.getValue()); ! context.put("other",data.getParameters().get("othertext")); context.put("othernuc",sample.getOtherNuclei()); context.put("care",sample.getSpecialCare()); --- 410,414 ---- context.put("usersidcomment",data.getParameters().get("sampleidcomment")); context.put("solvent", solvent.getValue()); ! context.put("other",sample.getOtherWishedSpectrum()); context.put("othernuc",sample.getOtherNuclei()); context.put("care",sample.getSpecialCare()); *************** *** 454,462 **** DBMachine fstrength=(DBMachine)DBMachinePeer.doSelect(crit).get(0); sample.setDBMachine(fstrength); ! String molecule = data.getParameters().get("MolTxt"); ! Molecule mol = (Molecule) new MDLReader(new StringReader(molecule)).read(new Molecule()); ! if(mol!= null && mol.getAtomCount()>0){ ! SubmittingData sd=new SubmittingData(ServletUtils.expandRelative(data.getServletConfig(), "/WEB-INF/conf/normalizer.xml")); ! sample.setProbableStructure(sd.saveMoleculeOnly(molecule, data, (NmrshiftdbUser)data.getUser())); } sample.setDate(new Date()); --- 454,484 ---- DBMachine fstrength=(DBMachine)DBMachinePeer.doSelect(crit).get(0); sample.setDBMachine(fstrength); ! IMolecule mol=null; ! if(data.getSession().getAttribute("applet") !=null && data.getSession().getAttribute("applet").equals("applet")){ ! String molecule = data.getParameters().get("MolTxt"); ! mol = (Molecule) new MDLReader(new StringReader(molecule)).read(new Molecule()); ! if(mol!= null && mol.getAtomCount()>0){ ! SubmittingData sd=new SubmittingData(ServletUtils.expandRelative(data.getServletConfig(), "/WEB-INF/conf/normalizer.xml")); ! sample.setProbableStructure(sd.saveMoleculeOnly(molecule, data, (NmrshiftdbUser)data.getUser())); ! GeneralUtils.addToStructureHistory(molecule, data.getSession()); ! } ! }else{ ! if(data.getRequest().getContentType()!=null && data.getRequest().getContentType().indexOf("multipart/form-data")>-1){ ! FileItem[] fi = data.getParameters().getFileItems("datei"); ! if(fi!=null){ ! StringBuffer messages=new StringBuffer(); ! GeneralUtils.processFileItem(fi[0],messages,data,"moltxt"); ! message+=messages.toString(); ! mol=(IMolecule)data.getSession().getAttribute("moltxt"); ! data.getSession().removeAttribute("moltxt"); ! if(mol!= null && mol.getAtomCount()>0){ ! SubmittingData sd=new SubmittingData(ServletUtils.expandRelative(data.getServletConfig(), "/WEB-INF/conf/normalizer.xml")); ! StringWriter sw = new StringWriter(); ! new MDLWriter(sw).writeMolecule(mol); ! sample.setProbableStructure(sd.saveMoleculeOnly(sw.toString(), data, (NmrshiftdbUser)data.getUser())); ! GeneralUtils.addToStructureHistory(sw.toString(), data.getSession()); ! } ! } ! } } sample.setDate(new Date()); *************** *** 466,472 **** sample.setProcess(data.getParameters().get("process")); String wishedSpectrum=""; - if(data.getParameters().get("othertext")!=null && !data.getParameters().get("othertext").equals("")){ - wishedSpectrum+=data.getParameters().get("othertext")+", "; - } Vector v=new Vector(); v.addAll(getTypesC()); --- 488,491 ---- *************** *** 479,483 **** } sample.setWishedSpectrum(wishedSpectrum); ! if(wishedSpectrum.equals("")){ message+="You did not enter a spectrum type!"; --- 498,504 ---- } sample.setWishedSpectrum(wishedSpectrum); ! if(data.getParameters().get("othertext")!=null && !data.getParameters().get("othertext").equals("")){ ! sample.setOtherWishedSpectrum(data.getParameters().get("othertext")); ! } if(wishedSpectrum.equals("")){ message+="You did not enter a spectrum type!"; *************** *** 485,489 **** sample.save(); } ! if(!message.equals("")){ context.put("ordertype",data.getParameters().get("process")); context.put("usersid",data.getParameters().get("sampleid")); --- 506,510 ---- sample.save(); } ! if(!message.equals("") && sample.getOtherNuclei().equals("") && sample.getOtherNuclei().equals("")){ context.put("ordertype",data.getParameters().get("process")); context.put("usersid",data.getParameters().get("sampleid")); |
|
From: Stefan K. <sh...@us...> - 2006-11-18 17:03:24
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6247/src/java/org/openscience/nmrshiftdb/om Modified Files: NmrshiftdbUser.java TurbineUserAdapter.java Log Message: the new affiliations are entered/edited along user data input Index: NmrshiftdbUser.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/NmrshiftdbUser.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -r1.27 -r1.28 *** NmrshiftdbUser.java 11 Jan 2006 15:30:46 -0000 1.27 --- NmrshiftdbUser.java 18 Nov 2006 17:03:12 -0000 1.28 *************** *** 171,175 **** public void save() throws Exception { super.save(); ! String sql = "UPDATE TURBINE_USER set HALL_OF_FAME=\"" + getHallOfFame() + "\", LABGROUP=\"" + getLabGroup()+ "\", BROKENEDIT=\""+getBrokenEdit()+"\", OLD_LITERATURE=\""+getOldLiterature()+"\" where USER_ID=" + super.getUserId() + ";"; NmrshiftdbUserPeer.executeStatement(sql); } --- 171,175 ---- public void save() throws Exception { super.save(); ! String sql = "UPDATE TURBINE_USER set HALL_OF_FAME=\"" + getHallOfFame() + "\", LABGROUP=\"" + getLabGroup()+ "\", BROKENEDIT=\""+getBrokenEdit()+"\", OLD_LITERATURE=\""+getOldLiterature()+"\", AFFILIATION_1=\""+this.getAffiliation1()+"\", AFFILIATION_2=\""+this.getAffiliation2()+"\" where USER_ID=" + super.getUserId() + ";"; NmrshiftdbUserPeer.executeStatement(sql); } Index: TurbineUserAdapter.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/TurbineUserAdapter.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** TurbineUserAdapter.java 17 Nov 2006 20:18:09 -0000 1.19 --- TurbineUserAdapter.java 18 Nov 2006 17:03:12 -0000 1.20 *************** *** 200,209 **** return tmp; } ! public String getAffiliation() throws Exception { ! /*String tmp = null; try { ! tmp = (String) getPerm(AFFILIATION); if ( tmp.length() == 0 ) tmp = null; --- 200,209 ---- return tmp; } ! public String getAffiliation1() throws Exception { ! String tmp = null; try { ! tmp = (String) getPerm(AFFILIATION_1); if ( tmp.length() == 0 ) tmp = null; *************** *** 212,219 **** { } ! return tmp;*/ ! String sql="SELECT AFFILIATION from TURBINE_USER where USER_ID="+getUserId()+";"; List l=NmrshiftdbUserPeer.executeQuery(sql); ! return(((Record) l.get(0)).getValue(1).asString()); } public String getBrokenSubmit() --- 212,236 ---- { } ! return tmp; ! /*String sql="SELECT AFFILIATION_1 from TURBINE_USER where USER_ID="+getUserId()+";"; List l=NmrshiftdbUserPeer.executeQuery(sql); ! return(((Record) l.get(0)).getValue(1).asString());*/ ! } ! public String getAffiliation2() throws Exception ! { ! String tmp = null; ! try ! { ! tmp = (String) getPerm(AFFILIATION_2); ! if ( tmp.length() == 0 ) ! tmp = null; ! } ! catch ( Exception e ) ! { ! } ! return tmp; ! /*String sql="SELECT AFFILIATION_2 from TURBINE_USER where USER_ID="+getUserId()+";"; ! List l=NmrshiftdbUserPeer.executeQuery(sql); ! return(((Record) l.get(0)).getValue(1).asString());*/ } public String getBrokenSubmit() |
|
From: Stefan K. <sh...@us...> - 2006-11-18 17:03:24
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/conf/jetspeed/WEB-INF/templates/vm/screens/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6247/src/conf/jetspeed/WEB-INF/templates/vm/screens/html Modified Files: EditAccount.vm NewAccount.vm Log Message: the new affiliations are entered/edited along user data input Index: EditAccount.vm =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/conf/jetspeed/WEB-INF/templates/vm/screens/html/EditAccount.vm,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** EditAccount.vm 17 Oct 2006 13:18:47 -0000 1.16 --- EditAccount.vm 18 Nov 2006 17:03:11 -0000 1.17 *************** *** 96,101 **** </tr> <tr> ! <td> Affiliation: </td> ! <td align=right><input name="affiliation" type="TEXT" value="$!data.User.Affiliation" /> </td> </tr> <tr> --- 96,105 ---- </tr> <tr> ! <td> Affiliation/institute: </td> ! <td align=right><input name="affiliation1" type="TEXT" value="$!data.User.Affiliation1" /> </td> ! </tr> ! <tr> ! <td> Affiliation/workgroup: </td> ! <td align=right><input name="affiliation2" type="TEXT" value="$!data.User.Affiliation2" /> </td> </tr> <tr> Index: NewAccount.vm =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/conf/jetspeed/WEB-INF/templates/vm/screens/html/NewAccount.vm,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** NewAccount.vm 12 Oct 2006 14:34:12 -0000 1.15 --- NewAccount.vm 18 Nov 2006 17:03:11 -0000 1.16 *************** *** 7,12 **** <h2>$l10n.NEWACCOUNT_TITLE</h2> <p>$l10n.NEWACCOUNT_NOTICE<br /> ! #if ( $config.getBoolean("newuser.approval.enable") == "false" ) ! #if ( $config.getBoolean("newuser.confirm.enable") == "true" ) $l10n.NEWACCOUNT_CONFIRMATION #end --- 7,12 ---- <h2>$l10n.NEWACCOUNT_TITLE</h2> <p>$l10n.NEWACCOUNT_NOTICE<br /> ! #if ( $config.getBoolean("newuser.approval.enable").toString() == "false" ) ! #if ( $config.getBoolean("newuser.confirm.enable").toString() == "true" ) $l10n.NEWACCOUNT_CONFIRMATION #end *************** *** 53,58 **** </tr> <tr bgcolor="#F8F8F8"> ! <td> Affiliation/Institute: </td> ! <td align=right><input name="affiliation" type="TEXT" value="$!data.Parameters.getString("affiliation")" /> </td> </tr> <tr> --- 53,76 ---- </tr> <tr bgcolor="#F8F8F8"> ! <td> Affiliation/Institute (enter or choose one): </td> ! <td align=right><input name="affiliation1" type="TEXT" value="$!data.Parameters.getString("affiliation1")" /> </td> ! <td> ! </select><select name="aff1" size="1"> ! #foreach($day in $urltool.getAff1()) ! <option value="$day">$day</option> ! #end ! </select> ! </td> ! </tr> ! <tr bgcolor="#F8F8F8"> ! <td> Affiliation/Workgroup (enter or choose one): </td> ! <td align=right><input name="affiliation2" type="TEXT" value="$!data.Parameters.getString("affiliation2")" /> </td> ! <td> ! </select><select name="aff2" size="1"> ! #foreach($day in $urltool.getAff2()) ! <option value="$day">$day</option> ! #end ! </select> ! </td> </tr> <tr> *************** *** 95,99 **** <td> I want to become a member of the following lab group, meaning I am either working there or want my compounds<br> to be measured there (use this only if you have spoken to a group leader of an actual NMRShiftDB lab group,<br> ! he will admit you and you will get an email if this is done):</td> <td> <select name="labgroup"> <option value="-1">---none---</option> --- 113,117 ---- <td> I want to become a member of the following lab group, meaning I am either working there or want my compounds<br> to be measured there (use this only if you have spoken to a group leader of an actual NMRShiftDB lab group,<br> ! he will admit you and you will get an email if this is done. Please make sure the affiliations are correct!):</td> <td> <select name="labgroup"> <option value="-1">---none---</option> |
|
From: Stefan K. <sh...@us...> - 2006-11-18 17:03:24
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/deploymentdescriptors In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6247/src/deploymentdescriptors Modified Files: NMRShiftDB.wsdl Log Message: the new affiliations are entered/edited along user data input Index: NMRShiftDB.wsdl =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/deploymentdescriptors/NMRShiftDB.wsdl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** NMRShiftDB.wsdl 24 Oct 2006 15:47:23 -0000 1.9 --- NMRShiftDB.wsdl 18 Nov 2006 17:03:11 -0000 1.10 *************** *** 19,23 **** <xsd:import namespace="http://www.nmrshiftdb.org/schemas/2006/10/NMRShiftDBTypes" ! schemaLocation="../schemas/NMRShiftDBTypes.xsd" /> <xsd:element name="doPredictionResponseValue" --- 19,23 ---- <xsd:import namespace="http://www.nmrshiftdb.org/schemas/2006/10/NMRShiftDBTypes" ! schemaLocation="NMRShiftDBTypes.xsd" /> <xsd:element name="doPredictionResponseValue" |
|
From: Stefan K. <sh...@us...> - 2006-11-18 17:03:24
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6247/src/vmtemplates/portlets/html Modified Files: worker-order.vm Log Message: the new affiliations are entered/edited along user data input Index: worker-order.vm =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html/worker-order.vm,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** worker-order.vm 17 Nov 2006 20:18:10 -0000 1.24 --- worker-order.vm 18 Nov 2006 17:03:13 -0000 1.25 *************** *** 86,90 **** <br><br> Statistics: ! <table> <tr><th>Yearly:</th><th>Monthly:</th></tr> <tr><td><form name="yearlyform" method="post" action="download/NmrshiftdbServlet/yearlyreport.pdf?nmrshiftdbaction=createreport&style=yearly">From:<select name="yearstart" size="1"> --- 86,90 ---- <br><br> Statistics: ! <table border="3" rules="cols"> <tr><th>Yearly:</th><th>Monthly:</th></tr> <tr><td><form name="yearlyform" method="post" action="download/NmrshiftdbServlet/yearlyreport.pdf?nmrshiftdbaction=createreport&style=yearly">From:<select name="yearstart" size="1"> *************** *** 98,101 **** --- 98,106 ---- #end </select> + </select> Type of report: <select name="type" size="1"> + #foreach($day in $types) + <option value="$day">$day</option> + #end + </select> <br><input type="submit" name="submityearly" value="Do statistics"/></form></td><td><form name="monthlyform" method="post" action="portal/pane0/NMR+lab+administration">From:<select name="frommonth" size="1"> #foreach($day in $months) *************** *** 116,119 **** --- 121,129 ---- #end </select> + </select> Type of report: <select name="type" size="1"> + #foreach($day in $types) + <option value="$day">$day</option> + #end + </select> <br><input type="submit" name="eventSubmit_doMonthlystatistcs" value="Do statistics"/></form></td></tr> </table> |
|
From: Stefan K. <sh...@us...> - 2006-11-18 17:03:24
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/reports In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6247/src/reports Modified Files: yearly_report_1.jasper yearly_report_1.jrxml Log Message: the new affiliations are entered/edited along user data input Index: yearly_report_1.jasper =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/reports/yearly_report_1.jasper,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 Binary files /tmp/cvs8v0itK and /tmp/cvsZ7d5yt differ Index: yearly_report_1.jrxml =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/reports/yearly_report_1.jrxml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** yearly_report_1.jrxml 17 Nov 2006 20:18:09 -0000 1.1 --- yearly_report_1.jrxml 18 Nov 2006 17:03:12 -0000 1.2 *************** *** 10,30 **** <property name="com.jasperassistant.designer.DataSource" value="nmrshiftdb"/> <queryString> ! <![CDATA[select YEAR(DATE) as YEAR, AFFILITATION_1, AFFILIATION_2, (WISHED_SPECTRUM like "%13C%" or WISHED_SPECTRUM like "%variable temperature%" or WISHED_SPECTRUM like "%ID sel. NOE%" or WISHED_SPECTRUM like "%solvent suppression%" or WISHED_SPECTRUM like "%standard spectrum%") as 1_D, (WISHED_SPECTRUM like "%H,H-COSY%" or WISHED_SPECTRUM like "%NOESY%" or WISHED_SPECTRUM like "%HMQC%" or WISHED_SPECTRUM like "%HMBC%") as 2_D, OTHER_WISHED_SPECTRUM!="" as SPECIAL, OTHER_NUCLEI!="" as HETERO, VALUE from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE join CONDITION on MACHINE.FIELD_STRENGTH=CONDITION.CONDITION_ID order by YEAR, AFFILITATION_1, AFFILIATION_2, 1_D, 2_D, SPECIAL, HETERO, VALUE;]]> </queryString> <field name="1_D" class="java.lang.Long"/> <field name="2_D" class="java.lang.Long"/> <field name="AFFILIATION_2" class="java.lang.String"/> ! <field name="AFFILITATION_1" class="java.lang.String"/> <field name="HETERO" class="java.lang.Long"/> <field name="SPECIAL" class="java.lang.Long"/> <field name="VALUE" class="java.lang.String"/> <field name="YEAR" class="java.lang.Long"/> ! <variable name="is1D" class="java.lang.String"> ! <variableExpression><![CDATA[$F{1_D}.equals(new Long(1)) ? "1 D" : ""]]></variableExpression> </variable> - <variable name="Variable_1" class="java.lang.String"/> <group name="GRP_YEAR"> <groupHeader> ! <band height="50"> <line> <reportElement x="3" y="1" width="551" height="1"/> --- 10,38 ---- <property name="com.jasperassistant.designer.DataSource" value="nmrshiftdb"/> <queryString> ! <![CDATA[select YEAR(DATE) as YEAR, AFFILIATION_1, AFFILIATION_2, VALUE, (WISHED_SPECTRUM like "%13C%" or WISHED_SPECTRUM like "%variable temperature%" or WISHED_SPECTRUM like "%ID sel. NOE%" or WISHED_SPECTRUM like "%solvent suppression%" or WISHED_SPECTRUM like "%standard spectrum%") as 1_D, (WISHED_SPECTRUM like "%H,H-COSY%" or WISHED_SPECTRUM like "%NOESY%" or WISHED_SPECTRUM like "%HMQC%" or WISHED_SPECTRUM like "%HMBC%") as 2_D, OTHER_WISHED_SPECTRUM!="" as SPECIAL, OTHER_NUCLEI!="" as HETERO from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE join CONDITION on MACHINE.FIELD_STRENGTH=CONDITION.CONDITION_ID order by YEAR, AFFILIATION_1, AFFILIATION_2, VALUE;]]> </queryString> <field name="1_D" class="java.lang.Long"/> <field name="2_D" class="java.lang.Long"/> <field name="AFFILIATION_2" class="java.lang.String"/> ! <field name="AFFILIATION_1" class="java.lang.String"/> <field name="HETERO" class="java.lang.Long"/> <field name="SPECIAL" class="java.lang.Long"/> <field name="VALUE" class="java.lang.String"/> <field name="YEAR" class="java.lang.Long"/> ! <variable name="1DSum" class="java.lang.Long" resetType="Group" resetGroup="GROUP_FREQ" calculation="Sum"> ! <variableExpression><![CDATA[$F{1_D}]]></variableExpression> ! </variable> ! <variable name="2DSum" class="java.lang.Long" resetType="Group" resetGroup="GROUP_FREQ" calculation="Sum"> ! <variableExpression><![CDATA[$F{2_D}]]></variableExpression> ! </variable> ! <variable name="SPECIALSum" class="java.lang.Long" resetType="Group" resetGroup="GROUP_FREQ" calculation="Sum"> ! <variableExpression><![CDATA[$F{SPECIAL}]]></variableExpression> ! </variable> ! <variable name="HETEROSum" class="java.lang.Long" resetType="Group" resetGroup="GROUP_FREQ" calculation="Sum"> ! <variableExpression><![CDATA[$F{HETERO}]]></variableExpression> </variable> <group name="GRP_YEAR"> <groupHeader> ! <band height="34"> <line> <reportElement x="3" y="1" width="551" height="1"/> *************** *** 32,41 **** </line> <textField> ! <reportElement x="44" y="13" width="80" height="20"/> <textElement textAlignment="Left"/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{YEAR}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="5" y="13" width="30" height="20"/> <textElement/> <text><![CDATA[Year]]></text> --- 40,49 ---- </line> <textField> ! <reportElement x="30" y="12" width="80" height="20"/> <textElement textAlignment="Left"/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{YEAR}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="5" y="13" width="23" height="20"/> <textElement/> <text><![CDATA[Year]]></text> *************** *** 46,60 **** <band height="50"> <textField> ! <reportElement x="157" y="16" width="80" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$V{GRP_YEAR_COUNT}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="14" y="16" width="94" height="20"/> <textElement/> <text><![CDATA[Measurements in]]></text> </staticText> <textField> ! <reportElement x="114" y="15" width="37" height="20"/> <textElement textAlignment="Left"/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{YEAR}]]></textFieldExpression> --- 54,68 ---- <band height="50"> <textField> ! <reportElement x="145" y="17" width="80" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$V{GRP_YEAR_COUNT}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="14" y="16" width="88" height="20"/> <textElement/> <text><![CDATA[Measurements in]]></text> </staticText> <textField> ! <reportElement x="105" y="16" width="37" height="20"/> <textElement textAlignment="Left"/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{YEAR}]]></textFieldExpression> *************** *** 64,68 **** </group> <group name="GRP_AFFILIATION_1"> ! <groupExpression><![CDATA[$F{AFFILITATION_1}]]></groupExpression> <groupHeader> <band height="36"> --- 72,76 ---- </group> <group name="GRP_AFFILIATION_1"> ! <groupExpression><![CDATA[$F{AFFILIATION_1}]]></groupExpression> <groupHeader> <band height="36"> *************** *** 74,78 **** <reportElement x="63" y="13" width="330" height="22"/> <textElement/> ! <textFieldExpression class="java.lang.String"><![CDATA[$F{AFFILITATION_1}]]></textFieldExpression> </textField> </band> --- 82,86 ---- <reportElement x="63" y="13" width="330" height="22"/> <textElement/> ! <textFieldExpression class="java.lang.String"><![CDATA[$F{AFFILIATION_1}]]></textFieldExpression> </textField> </band> *************** *** 86,97 **** </textField> <staticText> ! <reportElement x="66" y="8" width="90" height="15"/> <textElement/> <text><![CDATA[Measurements of]]></text> </staticText> <textField> ! <reportElement x="161" y="8" width="330" height="14"/> <textElement/> ! <textFieldExpression class="java.lang.String"><![CDATA[$F{AFFILITATION_1}]]></textFieldExpression> </textField> </band> --- 94,105 ---- </textField> <staticText> ! <reportElement x="66" y="8" width="86" height="15"/> <textElement/> <text><![CDATA[Measurements of]]></text> </staticText> <textField> ! <reportElement x="153" y="8" width="330" height="14"/> <textElement/> ! <textFieldExpression class="java.lang.String"><![CDATA[$F{AFFILIATION_1}]]></textFieldExpression> </textField> </band> *************** *** 117,126 **** </textField> <textField> ! <reportElement x="159" y="8" width="330" height="14"/> <textElement/> <textFieldExpression class="java.lang.String"><![CDATA[$F{AFFILIATION_2}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="64" y="8" width="90" height="15"/> <textElement/> <text><![CDATA[Measurements of]]></text> --- 125,134 ---- </textField> <textField> ! <reportElement x="151" y="8" width="330" height="14"/> <textElement/> <textFieldExpression class="java.lang.String"><![CDATA[$F{AFFILIATION_2}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="64" y="8" width="86" height="15"/> <textElement/> <text><![CDATA[Measurements of]]></text> *************** *** 129,216 **** </groupFooter> </group> ! <group name="GRP_EXp"> ! <groupExpression><![CDATA[$F{1_D}.toString()+$F{2_D}.toString()+$F{SPECIAL}.toString()+$F{HETERO}.toString()]]></groupExpression> <groupHeader> ! <band height="37"> <textField> ! <reportElement x="127" y="16" width="30" height="18"/> ! <textElement/> ! <textFieldExpression class="java.lang.Long"><![CDATA[$F{1_D}]]></textFieldExpression> ! </textField> ! <textField> ! <reportElement x="202" y="15" width="32" height="20"/> ! <textElement/> ! <textFieldExpression class="java.lang.Long"><![CDATA[$F{2_D}]]></textFieldExpression> ! </textField> ! <textField> ! <reportElement x="298" y="12" width="37" height="20"/> ! <textElement/> ! <textFieldExpression class="java.lang.Long"><![CDATA[$F{SPECIAL}]]></textFieldExpression> ! </textField> ! <textField> ! <reportElement x="396" y="13" width="42" height="20"/> <textElement/> ! <textFieldExpression class="java.lang.Long"><![CDATA[$F{HETERO}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="88" y="17" width="30" height="20"/> <textElement/> ! <text><![CDATA[1D ?]]></text> </staticText> <staticText> ! <reportElement x="164" y="16" width="29" height="20"/> <textElement/> ! <text><![CDATA[2D ?]]></text> </staticText> <staticText> ! <reportElement x="242" y="14" width="47" height="20"/> <textElement/> ! <text><![CDATA[Special ?]]></text> </staticText> <staticText> ! <reportElement x="342" y="13" width="48" height="20"/> <textElement/> ! <text><![CDATA[Hetero ?]]></text> </staticText> - <line> - <reportElement x="88" y="1" width="466" height="1"/> - <graphicElement/> - </line> - </band> - </groupHeader> - <groupFooter> - <band height="41"> <textField> ! <reportElement x="88" y="29" width="80" height="12"/> <textElement/> ! <textFieldExpression class="java.lang.Integer"><![CDATA[$V{GRP_EXp_COUNT}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="90" y="9" width="295" height="14"/> <textElement/> ! <text><![CDATA[Measurements with these types and all frequencies:]]></text> </staticText> - </band> - </groupFooter> - </group> - <group name="GROUP_FREQ"> - <groupExpression><![CDATA[$F{VALUE}]]></groupExpression> - <groupHeader> - <band height="33"> <textField> ! <reportElement x="179" y="12" width="27" height="20"/> <textElement/> ! <textFieldExpression class="java.lang.String"><![CDATA[$F{VALUE}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="116" y="13" width="52" height="20"/> <textElement/> ! <text><![CDATA[Frequency:]]></text> </staticText> ! <staticText> ! <reportElement x="212" y="12" width="102" height="20"/> <textElement/> ! <text><![CDATA[Mhz]]></text> ! </staticText> </band> </groupHeader> --- 137,203 ---- </groupFooter> </group> ! <group name="GROUP_FREQ"> ! <groupExpression><![CDATA[$F{VALUE}]]></groupExpression> <groupHeader> ! <band height="69"> <textField> ! <reportElement x="179" y="12" width="27" height="20"/> <textElement/> ! <textFieldExpression class="java.lang.String"><![CDATA[$F{VALUE}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="116" y="13" width="52" height="20"/> <textElement/> ! <text><![CDATA[Frequency:]]></text> </staticText> <staticText> ! <reportElement x="212" y="12" width="102" height="20"/> <textElement/> ! <text><![CDATA[Mhz]]></text> </staticText> <staticText> ! <reportElement x="119" y="49" width="19" height="20"/> <textElement/> ! <text><![CDATA[1D:]]></text> </staticText> + <textField> + <reportElement x="141" y="49" width="30" height="18"/> + <textElement/> + <textFieldExpression class="java.lang.Long"><![CDATA[$V{1DSum}]]></textFieldExpression> + </textField> <staticText> ! <reportElement x="195" y="48" width="18" height="20"/> <textElement/> ! <text><![CDATA[2D:]]></text> </staticText> <textField> ! <reportElement x="216" y="48" width="32" height="20"/> <textElement/> ! <textFieldExpression class="java.lang.Long"><![CDATA[$V{2DSum}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="273" y="46" width="40" height="20"/> <textElement/> ! <text><![CDATA[Special:]]></text> </staticText> <textField> ! <reportElement x="318" y="46" width="37" height="20"/> <textElement/> ! <textFieldExpression class="java.lang.Long"><![CDATA[$V{SPECIALSum}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="373" y="45" width="37" height="20"/> <textElement/> ! <text><![CDATA[Hetero:]]></text> </staticText> ! <textField> ! <reportElement x="413" y="45" width="42" height="20"/> <textElement/> ! <textFieldExpression class="java.lang.Long"><![CDATA[$V{HETEROSum}]]></textFieldExpression> ! </textField> ! <line> ! <reportElement x="114" y="3" width="435" height="1"/> ! <graphicElement/> ! </line> </band> </groupHeader> *************** *** 225,229 **** <reportElement x="117" y="10" width="320" height="14"/> <textElement/> ! <text><![CDATA[Measurements with this frequency and these types:]]></text> </staticText> </band> --- 212,216 ---- <reportElement x="117" y="10" width="320" height="14"/> <textElement/> ! <text><![CDATA[Measurements with this frequency:]]></text> </staticText> </band> |
|
From: Stefan K. <sh...@us...> - 2006-11-18 17:03:24
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6247/src/java/org/openscience/nmrshiftdb Modified Files: NmrshiftdbServlet.java Log Message: the new affiliations are entered/edited along user data input Index: NmrshiftdbServlet.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/NmrshiftdbServlet.java,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -r1.99 -r1.100 *** NmrshiftdbServlet.java 17 Nov 2006 20:18:09 -0000 1.99 --- NmrshiftdbServlet.java 18 Nov 2006 17:03:12 -0000 1.100 *************** *** 218,222 **** Connection conn=dbconn.getConnection(); Statement stmt=conn.createStatement(); ! ResultSet rs=stmt.executeQuery("select YEAR(DATE) as YEAR, "+(yearly? "": " MONTH(DATE) as MONTH, ")+"AFFILITATION_1, AFFILIATION_2, (WISHED_SPECTRUM like '%13C%' or WISHED_SPECTRUM like '%variable temperature%' or WISHED_SPECTRUM like '%ID sel. NOE%' or WISHED_SPECTRUM like '%solvent suppression%' or WISHED_SPECTRUM like '%standard spectrum%') as 1_D, (WISHED_SPECTRUM like '%H,H-COSY%' or WISHED_SPECTRUM like '%NOESY%' or WISHED_SPECTRUM like '%HMQC%' or WISHED_SPECTRUM like '%HMBC%') as 2_D, OTHER_WISHED_SPECTRUM!='' as SPECIAL, OTHER_NUCLEI!='' as HETERO, VALUE from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE join CONDITION on MACHINE.FIELD_STRENGTH=CONDITION.CONDITION_ID where YEAR(DATE)>="+yearstart+" and YEAR(DATE)<="+yearend+" order by YEAR, "+(yearly ? "" : "MONTH, ")+"AFFILITATION_1, AFFILIATION_2, 1_D, 2_D, SPECIAL, HETERO, VALUE"); //Fourth, create JasperPrint using fillReport() method JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters,new JRResultSetDataSource(rs)); --- 218,222 ---- Connection conn=dbconn.getConnection(); Statement stmt=conn.createStatement(); ! ResultSet rs=stmt.executeQuery("select YEAR(DATE) as YEAR, "+(yearly? "": " MONTH(DATE) as MONTH, ")+"AFFILIATION_1, AFFILIATION_2, VALUE, (WISHED_SPECTRUM like '%13C%' or WISHED_SPECTRUM like '%variable temperature%' or WISHED_SPECTRUM like '%ID sel. NOE%' or WISHED_SPECTRUM like '%solvent suppression%' or WISHED_SPECTRUM like '%standard spectrum%') as 1_D, (WISHED_SPECTRUM like '%H,H-COSY%' or WISHED_SPECTRUM like '%NOESY%' or WISHED_SPECTRUM like '%HMQC%' or WISHED_SPECTRUM like '%HMBC%') as 2_D, OTHER_WISHED_SPECTRUM!='' as SPECIAL, OTHER_NUCLEI!='' as HETERO from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE join CONDITION on MACHINE.FIELD_STRENGTH=CONDITION.CONDITION_ID where YEAR(DATE)>="+yearstart+" and YEAR(DATE)<="+yearend+" and LOGIN_NAME<>'testuser' order by YEAR, "+(yearly ? "" : "MONTH, ")+"AFFILIATION_1, AFFILIATION_2, VALUE"); //Fourth, create JasperPrint using fillReport() method JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters,new JRResultSetDataSource(rs)); |
|
From: Stefan K. <sh...@us...> - 2006-11-18 17:03:24
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6247/src/java/org/openscience/nmrshiftdb/modules/actions/portlets Modified Files: OrderAction.java OrderFullfillAction.java Log Message: the new affiliations are entered/edited along user data input Index: OrderAction.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderAction.java,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -r1.41 -r1.42 *** OrderAction.java 17 Nov 2006 20:18:09 -0000 1.41 --- OrderAction.java 18 Nov 2006 17:03:12 -0000 1.42 *************** *** 586,590 **** Vector v=BasePeer.executeQuery("select count(*) from SAMPLE where DATE>='"+fromyear+"-"+frommonth+"-1' and DATE<='"+toyear+"-"+tomonth+"-1'"); context.put("allinst", ((Record)v.get(0)).getValue(1).asInt()); ! context.put("aff1",BasePeer.executeQuery("select count(*), AFFILITATION_1 from SAMPLE join TURBINE_USER using (USER_ID) where DATE>='"+fromyear+"-"+frommonth+"-1' and DATE<='"+toyear+"-"+tomonth+"-1' group by AFFILITATION_1")); --- 586,590 ---- Vector v=BasePeer.executeQuery("select count(*) from SAMPLE where DATE>='"+fromyear+"-"+frommonth+"-1' and DATE<='"+toyear+"-"+tomonth+"-1'"); context.put("allinst", ((Record)v.get(0)).getValue(1).asInt()); ! context.put("aff1",BasePeer.executeQuery("select count(*), AFFILIATION_1 from SAMPLE join TURBINE_USER using (USER_ID) where DATE>='"+fromyear+"-"+frommonth+"-1' and DATE<='"+toyear+"-"+tomonth+"-1' group by AFFILIATION_1")); Index: OrderFullfillAction.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderFullfillAction.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -r1.27 -r1.28 *** OrderFullfillAction.java 17 Nov 2006 20:18:09 -0000 1.27 --- OrderFullfillAction.java 18 Nov 2006 17:03:12 -0000 1.28 *************** *** 86,89 **** --- 86,92 ---- } context.put("months", months); + Vector reporttypes=new Vector(); + reporttypes.add(new Integer(1)); + context.put("types",reporttypes); if(data.getParameters().get("submitorshow")!=null && data.getParameters().get("submitorshow").equals("show")){ DBSample toshow=DBSamplePeer.retrieveByPK(new NumberKey(data.getParameters().get("id"))); |
|
From: Stefan K. <sh...@us...> - 2006-11-18 17:03:16
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/conf/jetspeed/WEB-INF/conf In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6247/src/conf/jetspeed/WEB-INF/conf Modified Files: NMRShiftDB.properties Log Message: the new affiliations are entered/edited along user data input Index: NMRShiftDB.properties =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/conf/jetspeed/WEB-INF/conf/NMRShiftDB.properties,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -r1.51 -r1.52 *** NMRShiftDB.properties 22 Sep 2006 10:56:33 -0000 1.51 --- NMRShiftDB.properties 18 Nov 2006 17:03:11 -0000 1.52 *************** *** 18,24 **** hosecode.spheres=6 #This gives the start point of the current id range ! myidstart=0 #Gives the end of the id range (first id of next range) ! myidend=10000000 #Only spectra with this or higher mark are used for prediction minimum.mark.prediction=5 --- 18,24 ---- hosecode.spheres=6 #This gives the start point of the current id range ! myidstart=50000000 #Gives the end of the id range (first id of next range) ! myidend=60000000 #Only spectra with this or higher mark are used for prediction minimum.mark.prediction=5 |
|
From: Stefan K. <sh...@us...> - 2006-11-18 17:03:16
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/util In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6247/src/java/org/openscience/nmrshiftdb/util Modified Files: UrlTool.java Log Message: the new affiliations are entered/edited along user data input Index: UrlTool.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/util/UrlTool.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** UrlTool.java 24 Oct 2006 17:17:23 -0000 1.19 --- UrlTool.java 18 Nov 2006 17:03:12 -0000 1.20 *************** *** 20,23 **** --- 20,24 ---- import org.apache.soap.rpc.Parameter; import org.apache.soap.rpc.Response; + import org.apache.turbine.om.peer.BasePeer; import org.apache.turbine.om.security.User; import org.apache.turbine.services.pull.ApplicationTool; *************** *** 249,252 **** --- 250,273 ---- return ((Record)l.get(0)).getValue(1).asInt(); } + + public Vector getAff1() throws Exception{ + Vector v=BasePeer.executeQuery("select distinct AFFILIATION_1 from TURBINE_USER where LABGROUP>0"); + Vector v2=new Vector(); + v2.add(""); + for(int i=0;i<v.size();i++){ + v2.add(((Record)v.get(i)).getValue(1).asString()); + } + return v2; + } + + public Vector getAff2() throws Exception{ + Vector v=BasePeer.executeQuery("select distinct AFFILIATION_2 from TURBINE_USER where LABGROUP>0"); + Vector v2=new Vector(); + for(int i=0;i<v.size();i++){ + v2.add(""); + v2.add(((Record)v.get(i)).getValue(1).asString()); + } + return v2; + } } |
|
From: Stefan K. <sh...@us...> - 2006-11-18 17:03:16
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/apache/jetspeed/modules/actions In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6247/src/java/org/apache/jetspeed/modules/actions Modified Files: CreateNewUserAndConfirm.java UpdateAccount.java Log Message: the new affiliations are entered/edited along user data input Index: CreateNewUserAndConfirm.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** CreateNewUserAndConfirm.java 17 Nov 2006 20:18:08 -0000 1.32 --- CreateNewUserAndConfirm.java 18 Nov 2006 17:03:11 -0000 1.33 *************** *** 68,71 **** --- 68,72 ---- import org.apache.jetspeed.services.JetspeedSecurity; import org.apache.jetspeed.services.resources.JetspeedResources; + import org.apache.jetspeed.services.security.JetspeedDBSecurityService; import org.apache.turbine.modules.Action; import org.apache.turbine.modules.ActionLoader; *************** *** 231,236 **** return; } ! String webpage = data.getParameters().getString("webpage", ""); ! String affiliation = data.getParameters().getString("affiliation", ""); String CHNAME = Localization.getString("CREATENEWUSERANDCONFIRM_DUPLICATEMSG"); --- 232,238 ---- return; } ! // not needed since no checks shk3 ! //String webpage = data.getParameters().getString("webpage", ""); ! //String affiliation = data.getParameters().getString("affiliation", ""); String CHNAME = Localization.getString("CREATENEWUSERANDCONFIRM_DUPLICATEMSG"); *************** *** 256,261 **** user.setCountry(data.getParameters().getString("country")); user.setWebPage(data.getParameters().getString("webpage")); ! user.setAffiliation1(data.getParameters().getString("affiliation")); ! //TODO affiliion2 user.setEmail(data.getParameters().getString("email")); user.setCreateDate(new Date()); --- 258,271 ---- user.setCountry(data.getParameters().getString("country")); user.setWebPage(data.getParameters().getString("webpage")); ! if(data.getParameters().getString("aff1").equals("")){ ! user.setAffiliation1(data.getParameters().getString("affiliation1")); ! }else{ ! user.setAffiliation1(data.getParameters().getString("aff1")); ! } ! if(data.getParameters().getString("aff2").equals("")){ ! user.setAffiliation2(data.getParameters().getString("affiliation2")); ! }else{ ! user.setAffiliation2(data.getParameters().getString("aff2")); ! } user.setEmail(data.getParameters().getString("email")); user.setCreateDate(new Date()); *************** *** 270,274 **** url.append(x.substring(0,x.indexOf("template/ConfirmRegistration"))); url.append("pane0/Results?nmrshiftdbaction=acceptgroupmember&username=" + username + "&userkey=" + userkey); ! MailMessage mailmessage = new org.apache.turbine.util.mail.MailMessage(GeneralUtils.getSmtpServer(data), labgroup.getNmrshiftdbUser().getEmail(), GeneralUtils.getAdminEmail(data), "User wants to become member of your labgroup "+ labgroup.getLabgroupName(), "The user "+user.getFirstName()+" "+user.getLastName()+", email: "+user.getEmail()+", wants to become a member of your workgroup. Either accept her/him by clicking "+url+" or contact her/him directly!" + GeneralUtils.getEmailSignature(data)); if (mailmessage.send() == false) { Log.error("Sending email for labgroup membershift failed for user " + username); --- 280,284 ---- url.append(x.substring(0,x.indexOf("template/ConfirmRegistration"))); url.append("pane0/Results?nmrshiftdbaction=acceptgroupmember&username=" + username + "&userkey=" + userkey); ! MailMessage mailmessage = new org.apache.turbine.util.mail.MailMessage(GeneralUtils.getSmtpServer(data), labgroup.getNmrshiftdbUser().getEmail(), GeneralUtils.getAdminEmail(data), "User wants to become member of your labgroup "+ labgroup.getLabgroupName(), "The user "+user.getFirstName()+" "+user.getLastName()+", email: "+user.getEmail()+", affiliation: "+user.getAffiliation1()+"/"+user.getAffiliation2()+" wants to become a member of your workgroup. Either accept her/him by clicking "+url+" or contact her/him directly!" + GeneralUtils.getEmailSignature(data)); if (mailmessage.send() == false) { Log.error("Sending email for labgroup membershift failed for user " + username); *************** *** 319,323 **** //The user is made a contributor if he wishes ! if (data.getParameters().getString("contributor")!=null&&data.getParameters().getString("contributor").equals("contributor")) { //shk3: For reasons I don't understand it's necessary here to give dbconnection explicitly --- 329,333 ---- //The user is made a contributor if he wishes ! if (data.getParameters().getString("contributor")!=null&&data.getParameters().getString("contributor").equals("contributor") && (data.getParameters().getString("labgroup")==null || data.getParameters().getString("labgroup").equals("-1")) ) { //shk3: For reasons I don't understand it's necessary here to give dbconnection explicitly Index: UpdateAccount.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/apache/jetspeed/modules/actions/UpdateAccount.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** UpdateAccount.java 17 Nov 2006 20:18:08 -0000 1.11 --- UpdateAccount.java 18 Nov 2006 17:03:12 -0000 1.12 *************** *** 109,113 **** String country = data.getParameters().getString("country", ""); String webpage = data.getParameters().getString("webpage", ""); ! String affiliation = data.getParameters().getString("affiliation", ""); // Save user input in case there is an error and --- 109,114 ---- String country = data.getParameters().getString("country", ""); String webpage = data.getParameters().getString("webpage", ""); ! String affiliation1 = data.getParameters().getString("affiliation1", ""); ! String affiliation2 = data.getParameters().getString("affiliation2", ""); // Save user input in case there is an error and *************** *** 125,129 **** screenData.put("country", country); screenData.put("webpage", webpage); ! screenData.put("affiliation", affiliation); data.getRequest().setAttribute("ScreenDataEditAccount", screenData); --- 126,131 ---- screenData.put("country", country); screenData.put("webpage", webpage); ! screenData.put("affiliation1", affiliation1); ! screenData.put("affiliation2", affiliation2); data.getRequest().setAttribute("ScreenDataEditAccount", screenData); *************** *** 257,262 **** user.setCountry(data.getParameters().getString("country")); user.setWebPage(data.getParameters().getString("webpage")); ! user.setAffiliation1(data.getParameters().getString("affiliation")); ! //TODO affiliion2 if (changepass) --- 259,264 ---- user.setCountry(data.getParameters().getString("country")); user.setWebPage(data.getParameters().getString("webpage")); ! user.setAffiliation1(data.getParameters().getString("affiliation1")); ! user.setAffiliation2(data.getParameters().getString("affiliation2")); if (changepass) |
|
From: Stefan K. <sh...@us...> - 2006-11-17 20:18:58
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28040 Modified Files: build.xml Log Message: this is the first part of the reports system for the lab system Index: build.xml =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/build.xml,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -r1.65 -r1.66 *** build.xml 24 May 2006 09:26:42 -0000 1.65 --- build.xml 17 Nov 2006 20:18:02 -0000 1.66 *************** *** 69,72 **** --- 69,77 ---- </fileset> </copy> + <copy overwrite="yes" todir="${dist}/${jetspeed}/WEB-INF/reports"> + <fileset dir="${src}/reports"> + <include name="**/*" /> + </fileset> + </copy> <war warfile="${dist}/jetspeed.war" webxml="${src}/conf/web.xml"> <fileset dir="${dist}/${jetspeed}"/> |
|
From: Stefan K. <sh...@us...> - 2006-11-17 20:18:58
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/apache/jetspeed/modules/actions In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28040/src/java/org/apache/jetspeed/modules/actions Modified Files: CreateNewUserAndConfirm.java UpdateAccount.java Log Message: this is the first part of the reports system for the lab system Index: CreateNewUserAndConfirm.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -r1.31 -r1.32 *** CreateNewUserAndConfirm.java 22 Sep 2006 08:22:15 -0000 1.31 --- CreateNewUserAndConfirm.java 17 Nov 2006 20:18:08 -0000 1.32 *************** *** 256,260 **** user.setCountry(data.getParameters().getString("country")); user.setWebPage(data.getParameters().getString("webpage")); ! user.setAffiliation(data.getParameters().getString("affiliation")); user.setEmail(data.getParameters().getString("email")); user.setCreateDate(new Date()); --- 256,261 ---- user.setCountry(data.getParameters().getString("country")); user.setWebPage(data.getParameters().getString("webpage")); ! user.setAffiliation1(data.getParameters().getString("affiliation")); ! //TODO affiliion2 user.setEmail(data.getParameters().getString("email")); user.setCreateDate(new Date()); Index: UpdateAccount.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/apache/jetspeed/modules/actions/UpdateAccount.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** UpdateAccount.java 5 Jun 2006 21:02:12 -0000 1.10 --- UpdateAccount.java 17 Nov 2006 20:18:08 -0000 1.11 *************** *** 257,261 **** user.setCountry(data.getParameters().getString("country")); user.setWebPage(data.getParameters().getString("webpage")); ! user.setAffiliation(data.getParameters().getString("affiliation")); if (changepass) --- 257,262 ---- user.setCountry(data.getParameters().getString("country")); user.setWebPage(data.getParameters().getString("webpage")); ! user.setAffiliation1(data.getParameters().getString("affiliation")); ! //TODO affiliion2 if (changepass) |
|
From: Stefan K. <sh...@us...> - 2006-11-17 20:18:57
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28040/src/java/org/openscience/nmrshiftdb/om/map Modified Files: DBSampleMapBuilder.java Log Message: this is the first part of the reports system for the lab system Index: DBSampleMapBuilder.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map/DBSampleMapBuilder.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** DBSampleMapBuilder.java 30 Oct 2006 15:45:32 -0000 1.9 --- DBSampleMapBuilder.java 17 Nov 2006 20:18:09 -0000 1.10 *************** *** 89,92 **** --- 89,98 ---- } + /** SAMPLE.WISHED_SPECTRUM */ + public static String getDBSample_OtherWishedSpectrum() + { + return getTable() + ".OTHER_WISHED_SPECTRUM"; + } + /** SAMPLE.FINISHED */ public static String getDBSample_Finished() *************** *** 165,168 **** --- 171,176 ---- tMap.addColumn ( getDBSample_WishedSpectrum(), new String() ); + + tMap.addColumn ( getDBSample_OtherWishedSpectrum(), new String() ); tMap.addColumn ( getDBSample_Finished(), new String() ); |
