nmrshiftdb-devel Mailing List for NMRShiftDB (Page 2)
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-12-11 15:52:37
|
Update of /cvsroot/nmrshiftdb/spectrumapplet/src/java/org/openscience/nmrshiftdb/spectrumapplet/renderer/nmr In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22721/src/java/org/openscience/nmrshiftdb/spectrumapplet/renderer/nmr Modified Files: NmrNavigationSpectrum.java Log Message: reset of zoom and undocking should be possible Index: NmrNavigationSpectrum.java =================================================================== RCS file: /cvsroot/nmrshiftdb/spectrumapplet/src/java/org/openscience/nmrshiftdb/spectrumapplet/renderer/nmr/NmrNavigationSpectrum.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** NmrNavigationSpectrum.java 28 Jun 2005 14:41:38 -0000 1.1 --- NmrNavigationSpectrum.java 11 Dec 2006 15:52:29 -0000 1.2 *************** *** 38,41 **** --- 38,43 ---- public class NmrNavigationSpectrum extends AbstractRenderer { + public SpectrumNavigation specNav=null; + /** * Creates a NavigationSpectrum *************** *** 43,52 **** * @param l list of peaks */ ! public NmrNavigationSpectrum(SpectrumModel model, AbstractDataContainer l) { super(model, l); init(l); } /** * Init spectrum */ --- 45,67 ---- * @param l list of peaks */ ! public NmrNavigationSpectrum(SpectrumModel model, AbstractDataContainer l, SpectrumNavigation sn) { super(model, l); init(l); + this.specNav=sn; } /** + * Creates a NavigationSpectrum + * @param model the corresponding model + * @param l list of peaks + */ + public NmrNavigationSpectrum(SpectrumModel model, AbstractDataContainer l) { + super(model, l); + init(l); + this.specNav=null; + } + + + /** * Init spectrum */ |
|
From: Stefan K. <sh...@us...> - 2006-12-11 15:52:33
|
Update of /cvsroot/nmrshiftdb/spectrumapplet/src/java/org/openscience/nmrshiftdb/spectrumapplet/renderer/action In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22721/src/java/org/openscience/nmrshiftdb/spectrumapplet/renderer/action Modified Files: NavSpectrumMouseActions.java SpectrumMouseActions.java Log Message: reset of zoom and undocking should be possible Index: NavSpectrumMouseActions.java =================================================================== RCS file: /cvsroot/nmrshiftdb/spectrumapplet/src/java/org/openscience/nmrshiftdb/spectrumapplet/renderer/action/NavSpectrumMouseActions.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** NavSpectrumMouseActions.java 28 Jun 2005 14:41:37 -0000 1.1 --- NavSpectrumMouseActions.java 11 Dec 2006 15:52:29 -0000 1.2 *************** *** 20,30 **** package org.openscience.nmrshiftdb.spectrumapplet.renderer.action; ! import org.openscience.nmrshiftdb.spectrumapplet.renderer.nmr.*; ! ! import javax.swing.*; ! import javax.swing.event.*; ! ! import java.awt.*; ! import java.awt.event.*; /** --- 20,34 ---- package org.openscience.nmrshiftdb.spectrumapplet.renderer.action; ! import java.awt.Container; ! import java.awt.Cursor; ! import java.awt.event.MouseEvent; ! ! import javax.swing.JComponent; ! import javax.swing.JFrame; ! import javax.swing.event.MouseInputAdapter; ! ! import org.openscience.nmrshiftdb.spectrumapplet.renderer.SpectrumNavigation; ! import org.openscience.nmrshiftdb.spectrumapplet.renderer.nmr.NmrNavigationSpectrum; ! import org.openscience.nmrshiftdb.spectrumapplet.renderer.nmr.NmrSpecRenderer; /** *************** *** 112,115 **** --- 116,128 ---- */ public void mouseClicked(MouseEvent e) { + if (e.getButton() == e.BUTTON1) { + // check for double-click with left mouse button + if (!ignoreZoomOps && (e.getClickCount() >= 2)) { + SpectrumNavigation sn=((NmrNavigationSpectrum)renderer).specNav; + if (!sn.getJexf().isShowing()) { + sn.getJexf().show(sn); + } + } + } } Index: SpectrumMouseActions.java =================================================================== RCS file: /cvsroot/nmrshiftdb/spectrumapplet/src/java/org/openscience/nmrshiftdb/spectrumapplet/renderer/action/SpectrumMouseActions.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** SpectrumMouseActions.java 28 Jun 2005 14:41:37 -0000 1.1 --- SpectrumMouseActions.java 11 Dec 2006 15:52:29 -0000 1.2 *************** *** 130,134 **** // check for double-click with left mouse button if (!ignoreZoomOps && (e.getClickCount() >= 2)) { ! renderer.resetZoom(); } else if (e.getClickCount() == 1) { --- 130,134 ---- // check for double-click with left mouse button if (!ignoreZoomOps && (e.getClickCount() >= 2)) { ! renderer.resetZoom(); } else if (e.getClickCount() == 1) { |
|
From: Stefan K. <sh...@us...> - 2006-12-11 15:52:33
|
Update of /cvsroot/nmrshiftdb/spectrumapplet In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22721 Modified Files: build.xml Log Message: reset of zoom and undocking should be possible Index: build.xml =================================================================== RCS file: /cvsroot/nmrshiftdb/spectrumapplet/build.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** build.xml 21 Aug 2006 15:18:41 -0000 1.11 --- build.xml 11 Dec 2006 15:52:28 -0000 1.12 *************** *** 44,48 **** <delete file="${srcTemp}/MarvinWrapper.java"/> <delete file="${srcTemp}/SpectrumView.java"/> ! <javac srcdir="${srcTemp}" destdir="${build}" target="1.2" optimize="on" debug="off" deprecation="on" source="1.2"> <classpath refid="project.class.path" /> </javac> --- 44,48 ---- <delete file="${srcTemp}/MarvinWrapper.java"/> <delete file="${srcTemp}/SpectrumView.java"/> ! <javac srcdir="${srcTemp}" destdir="${build}" target="1.2" optimize="off" debug="on" deprecation="on" source="1.2"> <classpath refid="project.class.path" /> </javac> *************** *** 94,100 **** <target name="javadoc"> <mkdir dir="${doc}/api" /> ! <javadoc packagenames="*" ! sourcepath="${src}/main" ! sourcefiles="${src}/main/*.java" destdir="${doc}/api" access="private"> <classpath refid="project.class.path" /> --- 94,99 ---- <target name="javadoc"> <mkdir dir="${doc}/api" /> ! <javadoc packagenames="org.*" ! sourcepath="${src}/java" destdir="${doc}/api" access="private"> <classpath refid="project.class.path" /> |
|
From: Stefan K. <sh...@us...> - 2006-12-08 15:19:21
|
Update of /cvsroot/nmrshiftdb/spectrumapplet/src/java/org/openscience/nmrshiftdb/spectrumapplet In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv14184/src/java/org/openscience/nmrshiftdb/spectrumapplet Modified Files: SpectrumView.java Log Message: the highlighting in table works Index: SpectrumView.java =================================================================== RCS file: /cvsroot/nmrshiftdb/spectrumapplet/src/java/org/openscience/nmrshiftdb/spectrumapplet/SpectrumView.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** SpectrumView.java 10 Oct 2006 15:15:30 -0000 1.3 --- SpectrumView.java 8 Dec 2006 15:19:18 -0000 1.4 *************** *** 67,82 **** JSObject win = JSObject.getWindow(this); for(int i=0;i<atomNumbers.length;i++){ ! JSObject tr = (JSObject) win.eval("document.getElementById(\"tableid"+(atomNumbers[i]-1)+"\")"); if(tr!=null){ ! tr.setMember("bgColor","red"); } } if(oldnumbers!=null){ for(int i=0;i<oldnumbers.length;i++){ ! JSObject tr = (JSObject) win.eval("document.getElementById(\"tableid"+(oldnumbers[i]-1)+"\")"); if((oldnumbers[i]+1)%2==0) - tr.setMember("bgColor","#D3D3D3"); - else tr.setMember("bgColor","white"); } } --- 67,82 ---- JSObject win = JSObject.getWindow(this); for(int i=0;i<atomNumbers.length;i++){ ! JSObject tr = (JSObject) win.eval("document.getElementById(\"tableid"+(atomNumbers[i]-1)+"\").style"); if(tr!=null){ ! tr.setMember("backgroundColor","#FF6600"); } } if(oldnumbers!=null){ for(int i=0;i<oldnumbers.length;i++){ ! JSObject tr = (JSObject) win.eval("document.getElementById(\"tableid"+(oldnumbers[i]-1)+"\").style"); if((oldnumbers[i]+1)%2==0) tr.setMember("bgColor","white"); + else + tr.setMember("backgroundColor","#D3D3D3"); } } |
|
From: Stefan K. <sh...@us...> - 2006-12-08 12:57:30
|
Update of /cvsroot/nmrshiftdb/spectrumapplet/src/java/org/openscience/nmrshiftdb/spectrumapplet/renderer In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20306/src/java/org/openscience/nmrshiftdb/spectrumapplet/renderer Modified Files: SpectrumNavigation.java Log Message: the popup is placed on the original applet Index: SpectrumNavigation.java =================================================================== RCS file: /cvsroot/nmrshiftdb/spectrumapplet/src/java/org/openscience/nmrshiftdb/spectrumapplet/renderer/SpectrumNavigation.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** SpectrumNavigation.java 10 Oct 2006 15:15:35 -0000 1.6 --- SpectrumNavigation.java 8 Dec 2006 12:57:19 -0000 1.7 *************** *** 34,39 **** import java.awt.event.MouseEvent; import java.awt.event.MouseListener; - import java.awt.event.WindowAdapter; - import java.awt.event.WindowEvent; import javax.swing.JApplet; --- 34,37 ---- *************** *** 81,84 **** --- 79,83 ---- private boolean sizeDefined = false; private CorrelationControler corrCalc; + JExternalFrame jexf = null; /** *************** *** 652,655 **** --- 651,664 ---- } + /** + * @return Returns the jexf. + */ + private JExternalFrame getJexf() { + if (jexf == null) + jexf = new JExternalFrame(); + return jexf; + } + + /** * For detaching *************** *** 674,692 **** public void mousePressed(MouseEvent e) { if (e.getButton() == 1 && e.getClickCount() == 2) { ! frame.setSize((panel).getParent().getSize()); ! frame.addWindowListener( ! new WindowAdapter() { ! public void windowClosing(WindowEvent e) { ! parent.add(panel); ! parent.repaint(); ! PopupListener.this.frame.setVisible(false); ! } ! }); ! this.parent=panel.getParent(); ! (panel).getParent().remove(panel); ! frame.add(panel); ! frame.pack(); ! frame.setVisible(true); ! frame.toFront(); } } --- 683,689 ---- public void mousePressed(MouseEvent e) { if (e.getButton() == 1 && e.getClickCount() == 2) { ! if (!getJexf().isShowing()) { ! getJexf().show(panel); ! } } } |
|
From: Stefan K. <sh...@us...> - 2006-11-29 12:57:58
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20498/src/vmtemplates/portlets/html Modified Files: worker-order.vm Log Message: all workers can get statistics Index: worker-order.vm =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html/worker-order.vm,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -r1.28 -r1.29 *** worker-order.vm 29 Nov 2006 12:51:27 -0000 1.28 --- worker-order.vm 29 Nov 2006 12:57:54 -0000 1.29 *************** *** 87,93 **** #end </table> ! <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"> --- 87,94 ---- #end </table> ! #end ! <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"> *************** *** 130,135 **** </select> <br><input type="submit" name="eventSubmit_doMonthlystatistcs" value="Do statistics"/></form></td></tr> ! </table> ! #end #else You are not an operator in any labgroup or not yet approved! --- 131,135 ---- </select> <br><input type="submit" name="eventSubmit_doMonthlystatistcs" value="Do statistics"/></form></td></tr> ! </table> #else You are not an operator in any labgroup or not yet approved! |
|
From: Stefan K. <sh...@us...> - 2006-11-29 12:51:33
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/reports In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17527/src/reports Modified Files: monthly_report_1.jasper monthly_report_2.jasper yearly_report_1.jasper yearly_report_2.jasper Log Message: workers can now delete orders Index: monthly_report_1.jasper =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/reports/monthly_report_1.jasper,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 Binary files /tmp/cvsNUePBK and /tmp/cvsST0zR9 differ Index: monthly_report_2.jasper =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/reports/monthly_report_2.jasper,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 Binary files /tmp/cvsU0nrfc and /tmp/cvsR9nEiC differ Index: yearly_report_1.jasper =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/reports/yearly_report_1.jasper,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 Binary files /tmp/cvscj5gfk and /tmp/cvstXvosK differ Index: yearly_report_2.jasper =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/reports/yearly_report_2.jasper,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 Binary files /tmp/cvs0ZbtCK and /tmp/cvs5j81Mb differ |
|
From: Stefan K. <sh...@us...> - 2006-11-29 12:51:30
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17527/src/vmtemplates/portlets/html Modified Files: worker-order.vm Log Message: workers can now delete orders Index: worker-order.vm =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html/worker-order.vm,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -r1.27 -r1.28 *** worker-order.vm 24 Nov 2006 13:48:44 -0000 1.27 --- worker-order.vm 29 Nov 2006 12:51:27 -0000 1.28 *************** *** 44,47 **** --- 44,50 ---- Special care for sample: $sample.getSpecialCare()<br> #if($sample.getAttachmentIsSet()) <a href="download/NmrshiftdbServlet/$sample.getAttachmentName()?sampleid=$sample.getSampleId()&nmrshiftdbaction=getattachment">The user attached a file to the order</a> #end<br> + #if($sample.isDeletableWorker()) + <form name="orderform" method="post" action="portal/pane0/NMR+lab+administration"><input type="hidden" name="id" value="$sample.getSampleId()"><input type="submit" name="eventSubmit_doDeleteorder" value="Delete order"/> Confirm deletion by checking <input type="checkbox" name="confirm" value="confirm"></form> + #end </td> <td> *************** *** 103,107 **** #end </select> ! <br><input type="submit" name="submityearly" value="Do statistics"/></form></td><td><form name="monthlyform" method="post" action="download/NmrshiftdbServlet/yearlyreport.pdf?nmrshiftdbaction=createreport&style=monthly">From:<select name="monthstart" size="1"> #foreach($day in $months) <option value="$day">$day</option> --- 106,110 ---- #end </select> ! <br><input type="submit" name="submityearly" value="Do statistics"/></form></td><td><form name="monthlyform" method="post" action="download/NmrshiftdbServlet/monthlyreport.pdf?nmrshiftdbaction=createreport&style=monthly">From:<select name="monthstart" size="1"> #foreach($day in $months) <option value="$day">$day</option> |
|
From: Stefan K. <sh...@us...> - 2006-11-29 12:51:30
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17527/src/java/org/openscience/nmrshiftdb/modules/actions/portlets Modified Files: OrderFullfillAction.java Log Message: workers can now delete orders Index: OrderFullfillAction.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderFullfillAction.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -r1.29 -r1.30 *** OrderFullfillAction.java 24 Nov 2006 13:48:44 -0000 1.29 --- OrderFullfillAction.java 29 Nov 2006 12:51:25 -0000 1.30 *************** *** 23,26 **** --- 23,28 ---- import org.openscience.nmrshiftdb.om.DBMachinePeer; import org.openscience.nmrshiftdb.om.DBRawFile; + import org.openscience.nmrshiftdb.om.DBRawFileDBSpectrumPeer; + import org.openscience.nmrshiftdb.om.DBRawFilePeer; import org.openscience.nmrshiftdb.om.DBSample; import org.openscience.nmrshiftdb.om.DBSamplePeer; *************** *** 219,221 **** --- 221,245 ---- } } + + public void doDeleteorder(RunData data, Context context) throws Exception { + try{ + if(data.getParameters().get("confirm")!=null && data.getParameters().get("confirm").equals("confirm")){ + Criteria crit=new Criteria(); + crit.add(DBSamplePeer.SAMPLE_ID,data.getParameters().get("id")); + Vector v=DBRawFilePeer.doSelect(crit); + for(int i=0;i<v.size();i++){ + DBRawFile rf=(DBRawFile)v.get(i); + Criteria crit2=new Criteria(); + crit2.add(DBRawFilePeer.RAW_FILE_ID,rf.getRawFileId()); + DBRawFileDBSpectrumPeer.doDelete(crit); + } + DBRawFilePeer.doDelete(crit); + DBSamplePeer.doDelete(crit); + buildOrderContext(context,data); + } + }catch(Exception ex){ + ex.printStackTrace(); + GeneralUtils.logError(ex,"guestbook/doentry",data,true); + } + } } |
|
From: Stefan K. <sh...@us...> - 2006-11-29 12:51:30
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17527/src/java/org/openscience/nmrshiftdb/om Modified Files: DBSample.java Log Message: workers can now delete orders Index: DBSample.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/DBSample.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** DBSample.java 30 Oct 2006 15:45:32 -0000 1.6 --- DBSample.java 29 Nov 2006 12:51:26 -0000 1.7 *************** *** 26,29 **** --- 26,36 ---- return v.size()==0; } + + public boolean isDeletableWorker() throws Exception{ + Criteria crit=new Criteria(); + crit.add(DBRawFilePeer.SAMPLE_ID,this.getSampleId()); + Vector v=DBRawFilePeer.doSelect(crit); + return v.size()==0; + } public String getAttachmentStr(){ |
|
From: Stefan K. <sh...@us...> - 2006-11-24 16:50:09
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3468/src/java/org/openscience/nmrshiftdb Modified Files: NmrshiftdbServlet.java Log Message: bug in reports Index: NmrshiftdbServlet.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/NmrshiftdbServlet.java,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -r1.103 -r1.104 *** NmrshiftdbServlet.java 24 Nov 2006 13:48:43 -0000 1.103 --- NmrshiftdbServlet.java 24 Nov 2006 16:50:05 -0000 1.104 *************** *** 225,229 **** rs=stmt.executeQuery("select YEAR(DATE) as YEAR, "+(yearly? "": " MONTH(DATE) as MONTH, ")+"AFFILIATION_1, AFFILIATION_2, MACHINE.NAME as NAME, count(*) as C, sum(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, sum(WISHED_SPECTRUM like '%H,H-COSY%' or WISHED_SPECTRUM like '%NOESY%' or WISHED_SPECTRUM like '%HMQC%' or WISHED_SPECTRUM like '%HMBC%') as 2_D, sum(OTHER_WISHED_SPECTRUM!='') as SPECIAL, sum(OTHER_NUCLEI!='') as HETERO, sum(PROCESS='self') as SELF, sum(PROCESS='robot') as ROBOT, sum(PROCESS='worker') as OPERATOR from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE where YEAR(DATE)>="+yearstart+" and YEAR(DATE)<="+yearend+" and LOGIN_NAME<>'testuser' group by YEAR, "+(yearly ? "" : "MONTH, ")+"AFFILIATION_1, AFFILIATION_2, MACHINE.NAME"); }else if(type==2){ ! rs=stmt.executeQuery("select YEAR(DATE) as YEAR, "+(yearly? "": " MONTH(DATE) as MONTH, ")+"MACHINE.NAME as NAME, count(*) as C, sum(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, sum(WISHED_SPECTRUM like '%H,H-COSY%' or WISHED_SPECTRUM like '%NOESY%' or WISHED_SPECTRUM like '%HMQC%' or WISHED_SPECTRUM like '%HMBC%') as 2_D, sum(OTHER_WISHED_SPECTRUM!='') as SPECIAL, sum(OTHER_NUCLEI!='') as HETERO, sum(PROCESS='self') as SELF, sum(PROCESS='robot') as ROBOT, sum(PROCESS='worker') as OPERATOR from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE group by YEAR, MONTH, MACHINE.NAME"); } //Fourth, create JasperPrint using fillReport() method --- 225,229 ---- rs=stmt.executeQuery("select YEAR(DATE) as YEAR, "+(yearly? "": " MONTH(DATE) as MONTH, ")+"AFFILIATION_1, AFFILIATION_2, MACHINE.NAME as NAME, count(*) as C, sum(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, sum(WISHED_SPECTRUM like '%H,H-COSY%' or WISHED_SPECTRUM like '%NOESY%' or WISHED_SPECTRUM like '%HMQC%' or WISHED_SPECTRUM like '%HMBC%') as 2_D, sum(OTHER_WISHED_SPECTRUM!='') as SPECIAL, sum(OTHER_NUCLEI!='') as HETERO, sum(PROCESS='self') as SELF, sum(PROCESS='robot') as ROBOT, sum(PROCESS='worker') as OPERATOR from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE where YEAR(DATE)>="+yearstart+" and YEAR(DATE)<="+yearend+" and LOGIN_NAME<>'testuser' group by YEAR, "+(yearly ? "" : "MONTH, ")+"AFFILIATION_1, AFFILIATION_2, MACHINE.NAME"); }else if(type==2){ ! rs=stmt.executeQuery("select YEAR(DATE) as YEAR, "+(yearly? "": " MONTH(DATE) as MONTH, ")+"MACHINE.NAME as NAME, count(*) as C, sum(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, sum(WISHED_SPECTRUM like '%H,H-COSY%' or WISHED_SPECTRUM like '%NOESY%' or WISHED_SPECTRUM like '%HMQC%' or WISHED_SPECTRUM like '%HMBC%') as 2_D, sum(OTHER_WISHED_SPECTRUM!='') as SPECIAL, sum(OTHER_NUCLEI!='') as HETERO, sum(PROCESS='self') as SELF, sum(PROCESS='robot') as ROBOT, sum(PROCESS='worker') as OPERATOR from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE group by YEAR, "+(yearly ? "" : "MONTH, ")+"MACHINE.NAME"); } //Fourth, create JasperPrint using fillReport() method |
|
From: Stefan K. <sh...@us...> - 2006-11-24 13:48:48
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/reports In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21503/src/reports Modified Files: yearly_report_1.jasper yearly_report_1.jrxml Added Files: monthly_report_1.jasper monthly_report_1.jrxml monthly_report_2.jasper monthly_report_2.jrxml yearly_report_2.jasper yearly_report_2.jrxml Log Message: more reports --- NEW FILE: monthly_report_1.jasper --- ¬í leftMarginB pageHeightI printOrderI backgroundt importsSett pageFooterq pageHeaderq sr leftBorderq reportFontq topPaddingq expressionq parameterst Z expressionq expressionq resetGroupq sq sr uq sq sq sq sr sq sq pq sq GROUP_FREQt nmrshiftdbxsr PAGE_COUNTpq sq ppppppppppppppppppppppppppppppppppppt pppppppppppppppppppppppppppppppppppp sq loadFactorI field_SELF field_49_D field_YEAR field_50_D field_NAME initParams initFields PAGE_COUNT Exceptions SourceFile *´ *´ °¹¼ÇÊÕØ ã æ#ñ$ô(ÿ)- .23 7)8,<7=:AEBHFSGVKaLdPoQrU}VZ[_`d§eªiµj¸nÃoÆsÑtÔxßyâ}í~ðûþ %(36AD O¡R¥]¦`ªk«n¯y°|´µ¹º¾£Æ *´ --- NEW FILE: monthly_report_1.jrxml --- <?xml version="1.0" encoding="UTF-8"?> <!-- Created using an evaluation version of JasperAssistant (http://www.jasperassistant.com) --> <!DOCTYPE jasperReport PUBLIC "-//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd"> <jasperReport name="Unnamed" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="30" bottomMargin="30"> <property name="com.jasperassistant.designer.Grid" value="true"/> <property name="com.jasperassistant.designer.SnapToGrid" value="true"/> <property name="com.jasperassistant.designer.GridWidth" value="12"/> <property name="com.jasperassistant.designer.GridHeight" value="12"/> <property name="com.jasperassistant.designer.DataSource" value="nmrshiftdb"/> <parameter name="HEADER" class="java.lang.String"/> <queryString> <![CDATA[select YEAR(DATE) as YEAR, MONTH(DATE) as MONTH, AFFILIATION_1, AFFILIATION_2, MACHINE.NAME as NAME, count(*) as C, sum(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, sum(WISHED_SPECTRUM like "%H,H-COSY%" or WISHED_SPECTRUM like "%NOESY%" or WISHED_SPECTRUM like "%HMQC%" or WISHED_SPECTRUM like "%HMBC%") as 2_D, sum(OTHER_WISHED_SPECTRUM!="") as SPECIAL, sum(OTHER_NUCLEI!="") as HETERO, sum(PROCESS="self") as SELF, sum(PROCESS="robot") as ROBOT, sum(PROCESS="worker") as OPERATOR from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE group by YEAR, MONTH, AFFILIATION_1, AFFILIATION_2, MACHINE.NAME;]]> </queryString> <field name="1_D" class="java.lang.Integer"/> <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="NAME" class="java.lang.String"/> <field name="YEAR" class="java.lang.Long"/> <field name="C" class="java.lang.Integer"/> <field name="OPERATOR" class="java.lang.Integer"/> <field name="ROBOT" class="java.lang.Integer"/> <field name="SELF" class="java.lang.Integer"/> <field name="MONTH" class="java.lang.Integer"/> <variable name="GRP_AFFILIATION_2_Sum" class="java.lang.Integer" resetType="Group" resetGroup="GRP_AFFILIATION_2" calculation="Sum"> <variableExpression><![CDATA[$F{C}]]></variableExpression> </variable> <variable name="GRP_AFFILIATION_1_Sum" class="java.lang.Integer" resetType="Group" resetGroup="GRP_AFFILIATION_1" calculation="Sum"> <variableExpression><![CDATA[$F{C}]]></variableExpression> </variable> <variable name="GRP_YEAR_Sum" class="java.lang.Integer" resetType="Group" resetGroup="GRP_YEAR" calculation="Sum"> <variableExpression><![CDATA[$F{C}]]></variableExpression> </variable> <variable name="TOTAL_Sum" class="java.lang.Integer" calculation="Sum"> <variableExpression><![CDATA[$F{C}]]></variableExpression> </variable> <variable name="GRP_MONTH_Sum" class="java.lang.Integer" resetType="Group" resetGroup="GRP_MONTH" calculation="Sum"> <variableExpression><![CDATA[$F{C}]]></variableExpression> </variable> <group name="GRP_YEAR"> <groupExpression><![CDATA[$F{YEAR}]]></groupExpression> <groupHeader> <band height="34"> <line> <reportElement x="3" y="0" width="550" height="2"/> <graphicElement pen="4Point"/> </line> <textField> <reportElement x="24" y="12" width="80" height="20"/> <textElement textAlignment="Left"/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{YEAR}]]></textFieldExpression> </textField> <staticText> <reportElement x="0" y="12" width="23" height="20"/> <textElement/> <text><![CDATA[Year]]></text> </staticText> </band> </groupHeader> <groupFooter> <band height="25"> <textField> <reportElement x="144" y="0" width="80" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$V{GRP_YEAR_Sum}]]></textFieldExpression> </textField> <staticText> <reportElement x="0" y="0" width="88" height="20"/> <textElement/> <text><![CDATA[Measurements in]]></text> </staticText> <textField> <reportElement x="96" y="0" width="37" height="20"/> <textElement textAlignment="Left"/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{YEAR}]]></textFieldExpression> </textField> <staticText> <reportElement x="132" y="0" width="13" height="25"/> <textElement/> <text><![CDATA[:]]></text> </staticText> </band> </groupFooter> </group> <group name="GRP_MONTH"> <groupExpression><![CDATA[$F{MONTH}]]></groupExpression> <groupHeader> <band height="22"> <staticText> <reportElement x="60" y="0" width="37" height="20"/> <textElement/> <text><![CDATA[Month:]]></text> </staticText> <textField> <reportElement x="96" y="0" width="80" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{MONTH}]]></textFieldExpression> </textField> </band> </groupHeader> <groupFooter> <band height="28"> <staticText> <reportElement x="60" y="0" width="88" height="20"/> <textElement/> <text><![CDATA[Measurements in]]></text> </staticText> <textField> <reportElement x="180" y="0" width="37" height="20"/> <textElement textAlignment="Left"/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{YEAR}]]></textFieldExpression> </textField> <staticText> <reportElement x="216" y="0" width="13" height="25"/> <textElement/> <text><![CDATA[:]]></text> </staticText> <textField> <reportElement x="228" y="0" width="80" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$V{GRP_MONTH_Sum}]]></textFieldExpression> </textField> <textField> <reportElement x="156" y="0" width="13" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{MONTH}]]></textFieldExpression> </textField> <staticText> <reportElement x="168" y="0" width="13" height="20"/> <textElement/> <text><![CDATA[/]]></text> </staticText> </band> </groupFooter> </group> <group name="GRP_AFFILIATION_1"> <groupExpression><![CDATA[$F{AFFILIATION_1}]]></groupExpression> <groupHeader> <band height="36"> <rectangle> <reportElement x="117" y="1" width="436" height="34" backcolor="#E5E5E5"/> <graphicElement pen="None"/> </rectangle> <textField> <reportElement x="120" y="12" width="330" height="22"/> <textElement/> <textFieldExpression class="java.lang.String"><![CDATA[$F{AFFILIATION_1}]]></textFieldExpression> </textField> </band> </groupHeader> <groupFooter> <band height="31"> <textField> <reportElement x="117" y="11" width="80" height="13"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$V{GRP_AFFILIATION_1_Sum}]]></textFieldExpression> </textField> <staticText> <reportElement x="117" y="-1" width="86" height="15"/> <textElement/> <text><![CDATA[Measurements of]]></text> </staticText> <textField> <reportElement x="213" y="-1" width="330" height="14"/> <textElement/> <textFieldExpression class="java.lang.String"><![CDATA[$F{AFFILIATION_1}]]></textFieldExpression> </textField> </band> </groupFooter> </group> <group name="GRP_AFFILIATION_2"> <groupExpression><![CDATA[$F{AFFILIATION_2}]]></groupExpression> <groupHeader> <band height="32"> <textField> <reportElement x="120" y="10" width="330" height="20"/> <textElement/> <textFieldExpression class="java.lang.String"><![CDATA[$F{AFFILIATION_2}]]></textFieldExpression> </textField> </band> </groupHeader> <groupFooter> <band height="56"> <textField> <reportElement x="117" y="23" width="80" height="14"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$V{GRP_AFFILIATION_2_Sum}]]></textFieldExpression> </textField> <textField> <reportElement x="213" y="11" width="330" height="14"/> <textElement/> <textFieldExpression class="java.lang.String"><![CDATA[$F{AFFILIATION_2}]]></textFieldExpression> </textField> <staticText> <reportElement x="117" y="11" width="86" height="15"/> <textElement/> <text><![CDATA[Measurements of]]></text> </staticText> <line> <reportElement x="117" y="48" width="436" height="1"/> <graphicElement pen="4Point"/> </line> </band> </groupFooter> </group> <group name="GROUP_FREQ"> <groupExpression><![CDATA[$F{NAME}]]></groupExpression> <groupHeader> <band height="73"> <textField> <reportElement x="228" y="0" width="85" height="20"/> <textElement/> <textFieldExpression class="java.lang.String"><![CDATA[$F{NAME}]]></textFieldExpression> </textField> <staticText> <reportElement x="180" y="0" width="43" height="20"/> <textElement/> <text><![CDATA[Machine:]]></text> </staticText> <staticText> <reportElement x="180" y="24" width="19" height="20"/> <textElement/> <text><![CDATA[1D:]]></text> </staticText> <textField> <reportElement x="204" y="24" width="25" height="18"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{1_D}]]></textFieldExpression> </textField> <staticText> <reportElement x="252" y="24" width="18" height="20"/> <textElement/> <text><![CDATA[2D:]]></text> </staticText> <textField> <reportElement x="276" y="24" width="25" height="20"/> <textElement/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{2_D}]]></textFieldExpression> </textField> <staticText> <reportElement x="324" y="24" width="40" height="20"/> <textElement/> <text><![CDATA[Special:]]></text> </staticText> <textField> <reportElement x="372" y="24" width="25" height="20"/> <textElement/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{SPECIAL}]]></textFieldExpression> </textField> <staticText> <reportElement x="420" y="24" width="37" height="20"/> <textElement/> <text><![CDATA[Hetero:]]></text> </staticText> <textField> <reportElement x="468" y="24" width="25" height="20"/> <textElement/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{HETERO}]]></textFieldExpression> </textField> <line> <reportElement x="177" y="0" width="376" height="1"/> <graphicElement/> </line> <staticText> <reportElement x="180" y="48" width="157" height="20"/> <textElement/> <text><![CDATA[Measurement mode: Operator]]></text> </staticText> <textField> <reportElement x="336" y="48" width="13" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{OPERATOR}]]></textFieldExpression> </textField> <staticText> <reportElement x="348" y="48" width="97" height="20"/> <textElement/> <text><![CDATA[ , sample changer]]></text> </staticText> <textField> <reportElement x="444" y="48" width="13" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{ROBOT}]]></textFieldExpression> </textField> <staticText> <reportElement x="456" y="48" width="37" height="20"/> <textElement/> <text><![CDATA[ , self]]></text> </staticText> <textField> <reportElement x="492" y="48" width="25" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{SELF}]]></textFieldExpression> </textField> </band> </groupHeader> <groupFooter> <band height="33"> <textField> <reportElement x="177" y="11" width="80" height="13"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{C}]]></textFieldExpression> </textField> <staticText> <reportElement x="177" y="-1" width="320" height="13"/> <textElement/> <text><![CDATA[Measurements with this machine:]]></text> </staticText> </band> </groupFooter> </group> <pageHeader> <band height="23"> <rectangle> <reportElement x="1" y="0" width="555" height="23" backcolor="#BFBFBF"/> <graphicElement pen="None"/> </rectangle> <textField> <reportElement x="1" y="1" width="416" height="20"/> <textElement> <font size="16" isBold="true"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$P{HEADER}]]></textFieldExpression> </textField> </band> </pageHeader> <pageFooter> <band height="22"> <staticText> <reportElement x="276" y="0" width="25" height="19"/> <textElement/> <text><![CDATA[Page]]></text> </staticText> <textField> <reportElement x="300" y="0" width="80" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> </textField> </band> </pageFooter> <lastPageFooter> <band height="26"> <staticText> <reportElement x="0" y="0" width="93" height="20"/> <textElement/> <text><![CDATA[All measurements:]]></text> </staticText> <textField> <reportElement x="96" y="0" width="80" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$V{TOTAL_Sum}]]></textFieldExpression> </textField> </band> </lastPageFooter> </jasperReport> --- NEW FILE: monthly_report_2.jasper --- ¬í leftMarginB pageHeightI printOrderI backgroundt importsSett pageFooterq pageHeaderq sr leftBorderq reportFontq topPaddingq expressionq parameterst Z expressionq expressionq resetGroupq sq sr uq sq sq sq GROUP_FREQt nmrshiftdbxsr PAGE_COUNTpq sq sr loadFactorI field_YEAR field_50_D field_SELF field_NAME field_49_D initParams initFields PAGE_COUNT Exceptions SourceFile *´ # &$1%4)?*B.M/P3[4^8i9l=w>zB CGHL¡M¤Q¯Y *´ ïðô#õ&ù1ú4þ?ÿBMP[ ^ ilwz !¡"¤&¯. *´ ÄÅÉ#Ê&Î1Ï4Ó?ÔBØMÙPÝ[Þ^âiãlçwèzì íñòö¡÷¤û¯ --- NEW FILE: monthly_report_2.jrxml --- <?xml version="1.0" encoding="UTF-8"?> <!-- Created using an evaluation version of JasperAssistant (http://www.jasperassistant.com) --> <!DOCTYPE jasperReport PUBLIC "-//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd"> <jasperReport name="Unnamed" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="30" bottomMargin="30"> <property name="com.jasperassistant.designer.Grid" value="true"/> <property name="com.jasperassistant.designer.SnapToGrid" value="true"/> <property name="com.jasperassistant.designer.GridWidth" value="12"/> <property name="com.jasperassistant.designer.GridHeight" value="12"/> <property name="com.jasperassistant.designer.DataSource" value="nmrshiftdb"/> <parameter name="HEADER" class="java.lang.String"/> <queryString> <![CDATA[select YEAR(DATE) as YEAR, MONTH(DATE) as MONTH, MACHINE.NAME as NAME, count(*) as C, sum(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, sum(WISHED_SPECTRUM like "%H,H-COSY%" or WISHED_SPECTRUM like "%NOESY%" or WISHED_SPECTRUM like "%HMQC%" or WISHED_SPECTRUM like "%HMBC%") as 2_D, sum(OTHER_WISHED_SPECTRUM!="") as SPECIAL, sum(OTHER_NUCLEI!="") as HETERO, sum(PROCESS="self") as SELF, sum(PROCESS="robot") as ROBOT, sum(PROCESS="worker") as OPERATOR from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE group by YEAR, MONTH, MACHINE.NAME;]]> </queryString> <field name="1_D" class="java.lang.Integer"/> <field name="2_D" class="java.lang.Long"/> <field name="HETERO" class="java.lang.Long"/> <field name="SPECIAL" class="java.lang.Long"/> <field name="NAME" class="java.lang.String"/> <field name="YEAR" class="java.lang.Long"/> <field name="C" class="java.lang.Integer"/> <field name="OPERATOR" class="java.lang.Integer"/> <field name="SELF" class="java.lang.Integer"/> <field name="ROBOT" class="java.lang.Integer"/> <field name="MONTH" class="java.lang.Integer"/> <variable name="GRP_YEAR_Sum" class="java.lang.Integer" resetType="Group" resetGroup="GRP_YEAR" calculation="Sum"> <variableExpression><![CDATA[$F{C}]]></variableExpression> </variable> <variable name="TOTAL_Sum" class="java.lang.Integer" calculation="Sum"> <variableExpression><![CDATA[$F{C}]]></variableExpression> </variable> <variable name="GRP_MONTH_Sum" class="java.lang.Integer" resetType="Group" resetGroup="GRP_MONTH" calculation="Sum"> <variableExpression><![CDATA[$F{C}]]></variableExpression> </variable> <group name="GRP_YEAR"> <groupExpression><![CDATA[$F{YEAR}]]></groupExpression> <groupHeader> <band height="34"> <line> <reportElement x="3" y="0" width="550" height="2"/> <graphicElement pen="4Point"/> </line> <textField> <reportElement x="24" y="12" width="80" height="20"/> <textElement textAlignment="Left"/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{YEAR}]]></textFieldExpression> </textField> <staticText> <reportElement x="0" y="12" width="23" height="20"/> <textElement/> <text><![CDATA[Year]]></text> </staticText> </band> </groupHeader> <groupFooter> <band height="25"> <textField> <reportElement x="144" y="0" width="80" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$V{GRP_YEAR_Sum}]]></textFieldExpression> </textField> <staticText> <reportElement x="0" y="0" width="88" height="20"/> <textElement/> <text><![CDATA[Measurements in]]></text> </staticText> <textField> <reportElement x="96" y="0" width="37" height="20"/> <textElement textAlignment="Left"/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{YEAR}]]></textFieldExpression> </textField> <staticText> <reportElement x="132" y="0" width="13" height="25"/> <textElement/> <text><![CDATA[:]]></text> </staticText> </band> </groupFooter> </group> <group name="GRP_MONTH"> <groupExpression><![CDATA[$F{MONTH}]]></groupExpression> <groupHeader> <band height="26"> <textField> <reportElement x="96" y="0" width="80" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{MONTH}]]></textFieldExpression> </textField> <staticText> <reportElement x="60" y="0" width="37" height="20"/> <textElement/> <text><![CDATA[Month:]]></text> </staticText> </band> </groupHeader> <groupFooter> <band height="31"> <textField> <reportElement x="228" y="0" width="80" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$V{GRP_MONTH_Sum}]]></textFieldExpression> </textField> <staticText> <reportElement x="60" y="0" width="88" height="20"/> <textElement/> <text><![CDATA[Measurements in]]></text> </staticText> <textField> <reportElement x="180" y="0" width="37" height="20"/> <textElement textAlignment="Left"/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{YEAR}]]></textFieldExpression> </textField> <staticText> <reportElement x="168" y="0" width="13" height="20"/> <textElement/> <text><![CDATA[/]]></text> </staticText> <textField> <reportElement x="156" y="0" width="13" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{MONTH}]]></textFieldExpression> </textField> <line> <reportElement x="60" y="24" width="493" height="2"/> <graphicElement pen="4Point"/> </line> </band> </groupFooter> </group> <group name="GROUP_FREQ"> <groupExpression><![CDATA[$F{NAME}]]></groupExpression> <groupHeader> <band height="73"> <textField> <reportElement x="228" y="0" width="85" height="20"/> <textElement/> <textFieldExpression class="java.lang.String"><![CDATA[$F{NAME}]]></textFieldExpression> </textField> <staticText> <reportElement x="120" y="0" width="109" height="20"/> <textElement/> <text><![CDATA[Machine:]]></text> </staticText> <staticText> <reportElement x="120" y="24" width="19" height="20"/> <textElement/> <text><![CDATA[1D:]]></text> </staticText> <textField> <reportElement x="144" y="24" width="25" height="18"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{1_D}]]></textFieldExpression> </textField> <staticText> <reportElement x="192" y="24" width="18" height="20"/> <textElement/> <text><![CDATA[2D:]]></text> </staticText> <textField> <reportElement x="216" y="24" width="25" height="20"/> <textElement/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{2_D}]]></textFieldExpression> </textField> <staticText> <reportElement x="264" y="24" width="40" height="20"/> <textElement/> <text><![CDATA[Special:]]></text> </staticText> <textField> <reportElement x="312" y="24" width="25" height="20"/> <textElement/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{SPECIAL}]]></textFieldExpression> </textField> <staticText> <reportElement x="360" y="24" width="37" height="20"/> <textElement/> <text><![CDATA[Hetero:]]></text> </staticText> <textField> <reportElement x="408" y="24" width="25" height="20"/> <textElement/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{HETERO}]]></textFieldExpression> </textField> <line> <reportElement x="120" y="0" width="435" height="1"/> <graphicElement/> </line> <textField> <reportElement x="432" y="48" width="25" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{SELF}]]></textFieldExpression> </textField> <staticText> <reportElement x="288" y="48" width="97" height="20"/> <textElement/> <text><![CDATA[ , sample changer]]></text> </staticText> <staticText> <reportElement x="120" y="48" width="157" height="20"/> <textElement/> <text><![CDATA[Measurement mode: Operator]]></text> </staticText> <staticText> <reportElement x="396" y="48" width="37" height="20"/> <textElement/> <text><![CDATA[ , self]]></text> </staticText> <textField> <reportElement x="276" y="48" width="13" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{OPERATOR}]]></textFieldExpression> </textField> <textField> <reportElement x="384" y="48" width="13" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{ROBOT}]]></textFieldExpression> </textField> </band> </groupHeader> <groupFooter> <band height="33"> <textField> <reportElement x="120" y="12" width="80" height="13"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{C}]]></textFieldExpression> </textField> <staticText> <reportElement x="120" y="0" width="320" height="13"/> <textElement/> <text><![CDATA[Measurements in this mode:]]></text> </staticText> </band> </groupFooter> </group> <pageHeader> <band height="23"> <rectangle> <reportElement x="1" y="0" width="555" height="23" backcolor="#BFBFBF"/> <graphicElement pen="None"/> </rectangle> <textField> <reportElement x="1" y="1" width="416" height="20"/> <textElement> <font size="16" isBold="true"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$P{HEADER}]]></textFieldExpression> </textField> </band> </pageHeader> <pageFooter> <band height="22"> <staticText> <reportElement x="276" y="0" width="25" height="19"/> <textElement/> <text><![CDATA[Page]]></text> </staticText> <textField> <reportElement x="300" y="0" width="80" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> </textField> </band> </pageFooter> <lastPageFooter> <band height="26"> <staticText> <reportElement x="0" y="0" width="93" height="20"/> <textElement/> <text><![CDATA[All measurements:]]></text> </staticText> <textField> <reportElement x="96" y="0" width="80" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$V{TOTAL_Sum}]]></textFieldExpression> </textField> </band> </lastPageFooter> </jasperReport> --- NEW FILE: yearly_report_2.jasper --- ¬í leftMarginB pageHeightI printOrderI backgroundt importsSett pageFooterq pageHeaderq sr leftBorderq reportFontq topPaddingq expressionq parameterst sr Z expressionq expressionq resetGroupq sq sr uq sq GROUP_FREQt nmrshiftdbxsr PAGE_COUNTpq sq sr loadFactorI field_YEAR field_50_D field_SELF field_NAME field_49_D initParams initFields PAGE_COUNT Exceptions SourceFile *´ Ý àëîùü ##+ *´ ËÌÐ#Ø *´ xy}# --- NEW FILE: yearly_report_2.jrxml --- <?xml version="1.0" encoding="UTF-8"?> <!-- Created using an evaluation version of JasperAssistant (http://www.jasperassistant.com) --> <!DOCTYPE jasperReport PUBLIC "-//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd"> <jasperReport name="Unnamed" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="30" bottomMargin="30"> <property name="com.jasperassistant.designer.Grid" value="true"/> <property name="com.jasperassistant.designer.SnapToGrid" value="true"/> <property name="com.jasperassistant.designer.GridWidth" value="12"/> <property name="com.jasperassistant.designer.GridHeight" value="12"/> <property name="com.jasperassistant.designer.DataSource" value="nmrshiftdb"/> <parameter name="HEADER" class="java.lang.String"/> <queryString> <![CDATA[select YEAR(DATE) as YEAR, MACHINE.NAME as NAME, count(*) as C, sum(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, sum(WISHED_SPECTRUM like "%H,H-COSY%" or WISHED_SPECTRUM like "%NOESY%" or WISHED_SPECTRUM like "%HMQC%" or WISHED_SPECTRUM like "%HMBC%") as 2_D, sum(OTHER_WISHED_SPECTRUM!="") as SPECIAL, sum(OTHER_NUCLEI!="") as HETERO, sum(PROCESS="self") as SELF, sum(PROCESS="robot") as ROBOT, sum(PROCESS="worker") as OPERATOR from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE group by YEAR, MACHINE.NAME;]]> </queryString> <field name="1_D" class="java.lang.Integer"/> <field name="2_D" class="java.lang.Long"/> <field name="HETERO" class="java.lang.Long"/> <field name="SPECIAL" class="java.lang.Long"/> <field name="NAME" class="java.lang.String"/> <field name="YEAR" class="java.lang.Long"/> <field name="C" class="java.lang.Integer"/> <field name="OPERATOR" class="java.lang.Integer"/> <field name="SELF" class="java.lang.Integer"/> <field name="ROBOT" class="java.lang.Integer"/> <variable name="GRP_YEAR_Sum" class="java.lang.Integer" resetType="Group" resetGroup="GRP_YEAR" calculation="Sum"> <variableExpression><![CDATA[$F{C}]]></variableExpression> </variable> <variable name="TOTAL_Sum" class="java.lang.Integer" calculation="Sum"> <variableExpression><![CDATA[$F{C}]]></variableExpression> </variable> <group name="GRP_YEAR"> <groupExpression><![CDATA[$F{YEAR}]]></groupExpression> <groupHeader> <band height="34"> <line> <reportElement x="3" y="0" width="550" height="2"/> <graphicElement pen="4Point"/> </line> <textField> <reportElement x="24" y="12" width="80" height="20"/> <textElement textAlignment="Left"/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{YEAR}]]></textFieldExpression> </textField> <staticText> <reportElement x="0" y="12" width="23" height="20"/> <textElement/> <text><![CDATA[Year]]></text> </staticText> </band> </groupHeader> <groupFooter> <band height="25"> <textField> <reportElement x="144" y="0" width="80" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$V{GRP_YEAR_Sum}]]></textFieldExpression> </textField> <staticText> <reportElement x="0" y="0" width="88" height="20"/> <textElement/> <text><![CDATA[Measurements in]]></text> </staticText> <textField> <reportElement x="96" y="0" width="37" height="20"/> <textElement textAlignment="Left"/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{YEAR}]]></textFieldExpression> </textField> <staticText> <reportElement x="132" y="0" width="13" height="25"/> <textElement/> <text><![CDATA[:]]></text> </staticText> </band> </groupFooter> </group> <group name="GROUP_FREQ"> <groupExpression><![CDATA[$F{NAME}]]></groupExpression> <groupHeader> <band height="73"> <textField> <reportElement x="228" y="0" width="85" height="20"/> <textElement/> <textFieldExpression class="java.lang.String"><![CDATA[$F{NAME}]]></textFieldExpression> </textField> <staticText> <reportElement x="120" y="0" width="109" height="20"/> <textElement/> <text><![CDATA[Machine:]]></text> </staticText> <staticText> <reportElement x="120" y="24" width="19" height="20"/> <textElement/> <text><![CDATA[1D:]]></text> </staticText> <textField> <reportElement x="144" y="24" width="25" height="18"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{1_D}]]></textFieldExpression> </textField> <staticText> <reportElement x="192" y="24" width="18" height="20"/> <textElement/> <text><![CDATA[2D:]]></text> </staticText> <textField> <reportElement x="216" y="24" width="25" height="20"/> <textElement/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{2_D}]]></textFieldExpression> </textField> <staticText> <reportElement x="264" y="24" width="40" height="20"/> <textElement/> <text><![CDATA[Special:]]></text> </staticText> <textField> <reportElement x="312" y="24" width="25" height="20"/> <textElement/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{SPECIAL}]]></textFieldExpression> </textField> <staticText> <reportElement x="360" y="24" width="37" height="20"/> <textElement/> <text><![CDATA[Hetero:]]></text> </staticText> <textField> <reportElement x="408" y="24" width="25" height="20"/> <textElement/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{HETERO}]]></textFieldExpression> </textField> <line> <reportElement x="120" y="0" width="435" height="1"/> <graphicElement/> </line> <textField> <reportElement x="432" y="48" width="25" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{SELF}]]></textFieldExpression> </textField> <staticText> <reportElement x="288" y="48" width="97" height="20"/> <textElement/> <text><![CDATA[ , sample changer]]></text> </staticText> <staticText> <reportElement x="120" y="48" width="157" height="20"/> <textElement/> <text><![CDATA[Measurement mode: Operator]]></text> </staticText> <staticText> <reportElement x="396" y="48" width="37" height="20"/> <textElement/> <text><![CDATA[ , self]]></text> </staticText> <textField> <reportElement x="276" y="48" width="13" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{OPERATOR}]]></textFieldExpression> </textField> <textField> <reportElement x="384" y="48" width="13" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{ROBOT}]]></textFieldExpression> </textField> </band> </groupHeader> <groupFooter> <band height="33"> <textField> <reportElement x="120" y="12" width="80" height="13"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{C}]]></textFieldExpression> </textField> <staticText> <reportElement x="120" y="0" width="320" height="13"/> <textElement/> <text><![CDATA[Measurements in this mode:]]></text> </staticText> </band> </groupFooter> </group> <pageHeader> <band height="23"> <rectangle> <reportElement x="1" y="0" width="555" height="23" backcolor="#BFBFBF"/> <graphicElement pen="None"/> </rectangle> <textField> <reportElement x="1" y="1" width="416" height="20"/> <textElement> <font size="16" isBold="true"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$P{HEADER}]]></textFieldExpression> </textField> </band> </pageHeader> <pageFooter> <band height="22"> <staticText> <reportElement x="276" y="0" width="25" height="19"/> <textElement/> <text><![CDATA[Page]]></text> </staticText> <textField> <reportElement x="300" y="0" width="80" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> </textField> </band> </pageFooter> <lastPageFooter> <band height="26"> <staticText> <reportElement x="0" y="0" width="93" height="20"/> <textElement/> <text><![CDATA[All measurements:]]></text> </staticText> <textField> <reportElement x="96" y="0" width="80" height="20"/> <textElement/> <textFieldExpression class="java.lang.Integer"><![CDATA[$V{TOTAL_Sum}]]></textFieldExpression> </textField> </band> </lastPageFooter> </jasperReport> Index: yearly_report_1.jasper =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/reports/yearly_report_1.jasper,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 Binary files /tmp/cvsHXLmME and /tmp/cvsdUlJyg differ Index: yearly_report_1.jrxml =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/reports/yearly_report_1.jrxml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** yearly_report_1.jrxml 24 Nov 2006 09:20:40 -0000 1.4 --- yearly_report_1.jrxml 24 Nov 2006 13:48:44 -0000 1.5 *************** *** 11,15 **** <parameter name="HEADER" class="java.lang.String"/> <queryString> ! <![CDATA[select YEAR(DATE) as YEAR, AFFILIATION_1, AFFILIATION_2, MACHINE.NAME as NAME, count(*) as C, sum(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, sum(WISHED_SPECTRUM like "%H,H-COSY%" or WISHED_SPECTRUM like "%NOESY%" or WISHED_SPECTRUM like "%HMQC%" or WISHED_SPECTRUM like "%HMBC%") as 2_D, sum(OTHER_WISHED_SPECTRUM!="") as SPECIAL, sum(OTHER_NUCLEI!="") as HETERO from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE group by YEAR, AFFILIATION_1, AFFILIATION_2, MACHINE.NAME;]]> </queryString> <field name="1_D" class="java.lang.Integer"/> --- 11,15 ---- <parameter name="HEADER" class="java.lang.String"/> <queryString> ! <![CDATA[select YEAR(DATE) as YEAR, AFFILIATION_1, AFFILIATION_2, MACHINE.NAME as NAME, count(*) as C, sum(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, sum(WISHED_SPECTRUM like "%H,H-COSY%" or WISHED_SPECTRUM like "%NOESY%" or WISHED_SPECTRUM like "%HMQC%" or WISHED_SPECTRUM like "%HMBC%") as 2_D, sum(OTHER_WISHED_SPECTRUM!="") as SPECIAL, sum(OTHER_NUCLEI!="") as HETERO, sum(PROCESS="self") as SELF, sum(PROCESS="robot") as ROBOT, sum(PROCESS="worker") as OPERATOR from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE group by YEAR, AFFILIATION_1, AFFILIATION_2, MACHINE.NAME;]]> </queryString> <field name="1_D" class="java.lang.Integer"/> *************** *** 22,25 **** --- 22,28 ---- <field name="YEAR" class="java.lang.Long"/> <field name="C" class="java.lang.Integer"/> + <field name="OPERATOR" class="java.lang.Integer"/> + <field name="ROBOT" class="java.lang.Integer"/> + <field name="SELF" class="java.lang.Integer"/> <variable name="GRP_AFFILIATION_2_Sum" class="java.lang.Integer" resetType="Group" resetGroup="GRP_AFFILIATION_2" calculation="Sum"> <variableExpression><![CDATA[$F{C}]]></variableExpression> *************** *** 152,156 **** <groupExpression><![CDATA[$F{NAME}]]></groupExpression> <groupHeader> ! <band height="51"> <textField> <reportElement x="168" y="0" width="85" height="20"/> --- 155,159 ---- <groupExpression><![CDATA[$F{NAME}]]></groupExpression> <groupHeader> ! <band height="73"> <textField> <reportElement x="168" y="0" width="85" height="20"/> *************** *** 207,210 **** --- 210,243 ---- <graphicElement/> </line> + <staticText> + <reportElement x="120" y="48" width="157" height="20"/> + <textElement/> + <text><![CDATA[Measurement mode: Operator]]></text> + </staticText> + <textField> + <reportElement x="276" y="48" width="13" height="20"/> + <textElement/> + <textFieldExpression class="java.lang.Integer"><![CDATA[$F{OPERATOR}]]></textFieldExpression> + </textField> + <staticText> + <reportElement x="288" y="48" width="97" height="20"/> + <textElement/> + <text><![CDATA[ , sample changer]]></text> + </staticText> + <textField> + <reportElement x="384" y="48" width="13" height="20"/> + <textElement/> + <textFieldExpression class="java.lang.Integer"><![CDATA[$F{ROBOT}]]></textFieldExpression> + </textField> + <staticText> + <reportElement x="396" y="48" width="37" height="20"/> + <textElement/> + <text><![CDATA[ , self]]></text> + </staticText> + <textField> + <reportElement x="432" y="48" width="25" height="20"/> + <textElement/> + <textFieldExpression class="java.lang.Integer"><![CDATA[$F{SELF}]]></textFieldExpression> + </textField> </band> </groupHeader> |
|
From: Stefan K. <sh...@us...> - 2006-11-24 13:48:46
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21503/src/java/org/openscience/nmrshiftdb Modified Files: NmrshiftdbServlet.java Log Message: more reports Index: NmrshiftdbServlet.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/NmrshiftdbServlet.java,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -r1.102 -r1.103 *** NmrshiftdbServlet.java 24 Nov 2006 09:20:40 -0000 1.102 --- NmrshiftdbServlet.java 24 Nov 2006 13:48:43 -0000 1.103 *************** *** 209,221 **** 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(); ! parameters.put("HEADER", "Report for years "+yearstart+" - "+yearend); //Third, get a database connection DBConnection dbconn = TurbineDB.getConnection(); 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, MACHINE.NAME as NAME, count(*) as C, sum(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, sum(WISHED_SPECTRUM like '%H,H-COSY%' or WISHED_SPECTRUM like '%NOESY%' or WISHED_SPECTRUM like '%HMQC%' or WISHED_SPECTRUM like '%HMBC%') as 2_D, sum(OTHER_WISHED_SPECTRUM!='') as SPECIAL, sum(OTHER_NUCLEI!='') as HETERO from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE where YEAR(DATE)>="+yearstart+" and YEAR(DATE)<="+yearend+" and LOGIN_NAME<>'testuser' group by YEAR, "+(yearly ? "" : "MONTH, ")+"AFFILIATION_1, AFFILIATION_2, MACHINE.NAME"); //Fourth, create JasperPrint using fillReport() method JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters,new JRResultSetDataSource(rs)); --- 209,230 ---- monthend=Integer.parseInt(req.getParameter("monthend")); } ! int type=Integer.parseInt(req.getParameter("type")); ! JasperReport jasperReport = (JasperReport)JRLoader.loadObject(relativepath+"/reports/"+(yearly ? "yearly" : "monthly")+"_report_"+type+".jasper"); //Second, create a map of parameters to pass to the report. Map parameters = new HashMap(); ! if(yearly) ! parameters.put("HEADER", "Report for years "+yearstart+" - "+yearend); ! else ! parameters.put("HEADER", "Report for "+monthstart+"/"+yearstart+" - "+monthend+"/"+yearend); //Third, get a database connection DBConnection dbconn = TurbineDB.getConnection(); Connection conn=dbconn.getConnection(); Statement stmt=conn.createStatement(); ! ResultSet rs=null; ! if(type==1){ ! rs=stmt.executeQuery("select YEAR(DATE) as YEAR, "+(yearly? "": " MONTH(DATE) as MONTH, ")+"AFFILIATION_1, AFFILIATION_2, MACHINE.NAME as NAME, count(*) as C, sum(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, sum(WISHED_SPECTRUM like '%H,H-COSY%' or WISHED_SPECTRUM like '%NOESY%' or WISHED_SPECTRUM like '%HMQC%' or WISHED_SPECTRUM like '%HMBC%') as 2_D, sum(OTHER_WISHED_SPECTRUM!='') as SPECIAL, sum(OTHER_NUCLEI!='') as HETERO, sum(PROCESS='self') as SELF, sum(PROCESS='robot') as ROBOT, sum(PROCESS='worker') as OPERATOR from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE where YEAR(DATE)>="+yearstart+" and YEAR(DATE)<="+yearend+" and LOGIN_NAME<>'testuser' group by YEAR, "+(yearly ? "" : "MONTH, ")+"AFFILIATION_1, AFFILIATION_2, MACHINE.NAME"); ! }else if(type==2){ ! rs=stmt.executeQuery("select YEAR(DATE) as YEAR, "+(yearly? "": " MONTH(DATE) as MONTH, ")+"MACHINE.NAME as NAME, count(*) as C, sum(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, sum(WISHED_SPECTRUM like '%H,H-COSY%' or WISHED_SPECTRUM like '%NOESY%' or WISHED_SPECTRUM like '%HMQC%' or WISHED_SPECTRUM like '%HMBC%') as 2_D, sum(OTHER_WISHED_SPECTRUM!='') as SPECIAL, sum(OTHER_NUCLEI!='') as HETERO, sum(PROCESS='self') as SELF, sum(PROCESS='robot') as ROBOT, sum(PROCESS='worker') as OPERATOR from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE group by YEAR, MONTH, MACHINE.NAME"); ! } //Fourth, create JasperPrint using fillReport() method JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters,new JRResultSetDataSource(rs)); |
|
From: Stefan K. <sh...@us...> - 2006-11-24 13:48:46
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21503/src/java/org/openscience/nmrshiftdb/modules/actions/portlets Modified Files: OrderFullfillAction.java Log Message: more reports Index: OrderFullfillAction.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderFullfillAction.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -r1.28 -r1.29 *** OrderFullfillAction.java 18 Nov 2006 17:03:12 -0000 1.28 --- OrderFullfillAction.java 24 Nov 2006 13:48:44 -0000 1.29 *************** *** 88,91 **** --- 88,92 ---- Vector reporttypes=new Vector(); reporttypes.add(new Integer(1)); + reporttypes.add(new Integer(2)); context.put("types",reporttypes); if(data.getParameters().get("submitorshow")!=null && data.getParameters().get("submitorshow").equals("show")){ |
|
From: Stefan K. <sh...@us...> - 2006-11-24 13:48:46
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21503/src/vmtemplates/portlets/html Modified Files: worker-order.vm Log Message: more reports Index: worker-order.vm =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html/worker-order.vm,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -r1.26 -r1.27 *** worker-order.vm 18 Nov 2006 18:38:15 -0000 1.26 --- worker-order.vm 24 Nov 2006 13:48:44 -0000 1.27 *************** *** 103,120 **** #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) <option value="$day">$day</option> #end ! </select>/<select name="fromyear" size="1"> #foreach($day in $years) <option value="$day">$day</option> #end </select> ! to: <select name="tomonth" size="1"> #foreach($day in $months) <option value="$day">$day</option> #end ! </select>/<select name="toyear" size="1"> #foreach($day in $years) <option value="$day">$day</option> --- 103,120 ---- #end </select> ! <br><input type="submit" name="submityearly" value="Do statistics"/></form></td><td><form name="monthlyform" method="post" action="download/NmrshiftdbServlet/yearlyreport.pdf?nmrshiftdbaction=createreport&style=monthly">From:<select name="monthstart" size="1"> #foreach($day in $months) <option value="$day">$day</option> #end ! </select>/<select name="yearstart" size="1"> #foreach($day in $years) <option value="$day">$day</option> #end </select> ! to: <select name="monthend" size="1"> #foreach($day in $months) <option value="$day">$day</option> #end ! </select>/<select name="yearend" size="1"> #foreach($day in $years) <option value="$day">$day</option> |
|
From: Stefan K. <sh...@us...> - 2006-11-24 09:20:43
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32389/src/java/org/openscience/nmrshiftdb Modified Files: NmrshiftdbServlet.java Log Message: improved report Index: NmrshiftdbServlet.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/NmrshiftdbServlet.java,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -r1.101 -r1.102 *** NmrshiftdbServlet.java 19 Nov 2006 16:29:32 -0000 1.101 --- NmrshiftdbServlet.java 24 Nov 2006 09:20:40 -0000 1.102 *************** *** 212,222 **** //Second, create a map of parameters to pass to the report. Map parameters = new HashMap(); ! parameters.put("ReportTitle", "Basic JasperReport"); ! parameters.put("MaxSalary", new Double(25000.00)); //Third, get a database connection DBConnection dbconn = TurbineDB.getConnection(); 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)); --- 212,221 ---- //Second, create a map of parameters to pass to the report. Map parameters = new HashMap(); ! parameters.put("HEADER", "Report for years "+yearstart+" - "+yearend); //Third, get a database connection DBConnection dbconn = TurbineDB.getConnection(); 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, MACHINE.NAME as NAME, count(*) as C, sum(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, sum(WISHED_SPECTRUM like '%H,H-COSY%' or WISHED_SPECTRUM like '%NOESY%' or WISHED_SPECTRUM like '%HMQC%' or WISHED_SPECTRUM like '%HMBC%') as 2_D, sum(OTHER_WISHED_SPECTRUM!='') as SPECIAL, sum(OTHER_NUCLEI!='') as HETERO from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE where YEAR(DATE)>="+yearstart+" and YEAR(DATE)<="+yearend+" and LOGIN_NAME<>'testuser' group by YEAR, "+(yearly ? "" : "MONTH, ")+"AFFILIATION_1, AFFILIATION_2, MACHINE.NAME"); //Fourth, create JasperPrint using fillReport() method JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters,new JRResultSetDataSource(rs)); |
|
From: Stefan K. <sh...@us...> - 2006-11-24 09:20:43
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/reports In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32389/src/reports Modified Files: yearly_report_1.jasper yearly_report_1.jrxml Log Message: improved report Index: yearly_report_1.jasper =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/reports/yearly_report_1.jasper,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 Binary files /tmp/cvsMie1fS and /tmp/cvsiweMPy differ Index: yearly_report_1.jrxml =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/reports/yearly_report_1.jrxml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** yearly_report_1.jrxml 23 Nov 2006 23:56:49 -0000 1.3 --- yearly_report_1.jrxml 24 Nov 2006 09:20:40 -0000 1.4 *************** *** 39,43 **** <band height="34"> <line> ! <reportElement x="3" y="1" width="551" height="1"/> <graphicElement pen="4Point"/> </line> --- 39,43 ---- <band height="34"> <line> ! <reportElement x="3" y="0" width="550" height="2"/> <graphicElement pen="4Point"/> </line> *************** *** 71,74 **** --- 71,79 ---- <textFieldExpression class="java.lang.Long"><![CDATA[$F{YEAR}]]></textFieldExpression> </textField> + <staticText> + <reportElement x="132" y="0" width="13" height="25"/> + <textElement/> + <text><![CDATA[:]]></text> + </staticText> </band> </groupFooter> *************** *** 138,142 **** </staticText> <line> ! <reportElement x="60" y="48" width="488" height="4"/> <graphicElement pen="4Point"/> </line> --- 143,147 ---- </staticText> <line> ! <reportElement x="60" y="48" width="493" height="1"/> <graphicElement pen="4Point"/> </line> *************** *** 149,153 **** <band height="51"> <textField> ! <reportElement x="168" y="0" width="27" height="20"/> <textElement/> <textFieldExpression class="java.lang.String"><![CDATA[$F{NAME}]]></textFieldExpression> --- 154,158 ---- <band height="51"> <textField> ! <reportElement x="168" y="0" width="85" height="20"/> <textElement/> <textFieldExpression class="java.lang.String"><![CDATA[$F{NAME}]]></textFieldExpression> *************** *** 222,226 **** <band height="23"> <rectangle> ! <reportElement x="1" y="0" width="555" height="23" backcolor="#5D5DD7"/> <graphicElement pen="None"/> </rectangle> --- 227,231 ---- <band height="23"> <rectangle> ! <reportElement x="1" y="0" width="555" height="23" backcolor="#BFBFBF"/> <graphicElement pen="None"/> </rectangle> |
|
From: Stefan K. <sh...@us...> - 2006-11-24 09:20:43
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/doc In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32389/doc Modified Files: nmrshiftdb-schema.xml Log Message: improved report Index: nmrshiftdb-schema.xml =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/doc/nmrshiftdb-schema.xml,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -r1.80 -r1.81 *** nmrshiftdb-schema.xml 18 Nov 2006 18:38:14 -0000 1.80 --- nmrshiftdb-schema.xml 24 Nov 2006 09:20:39 -0000 1.81 *************** *** 38,41 **** --- 38,42 ---- <column name="DICT_REF" required="true" type="VARCHAR" size="255"/> <column name="UNITS" required="true" type="VARCHAR" size="255"/> + <column name="CML_ENTRY_TYPE" required="true" type="VARCHAR" size="255"/> </table> *************** *** 100,103 **** --- 101,107 ---- <column name="NMRSHIFTDB_NUMBER" required="true" type="VARCHAR" size="255"/> <column name="MOLECULAR_WEIGHT" required="true" type="FLOAT"/> + <column name="SMILES_STRING" required="true" type="VARBINARY"/> + <column name="SMILES_STRING_CHIRAL" required="false" type="VARBINARY"/> + <column name="USER_ID" required="true" type="INTEGER"/> <column name="fp0" required="true" type="BIGINT"/> <column name="fp1" required="true" type="BIGINT"/> *************** *** 116,125 **** <column name="fp14" required="true" type="BIGINT"/> <column name="fp15" required="true" type="BIGINT"/> - <column name="SMILES_STRING" required="true" type="VARBINARY"/> - <column name="SMILES_STRING_CHIRAL" required="false" type="VARBINARY"/> <column name="DBE" required="true" type="FLOAT"/> <column name="SSSR" required="true" type="INTEGER"/> <column name="SAR" required="true" type="INTEGER"/> - <column name="USER_ID" required="true" type="INTEGER"/> <column name="COMMENT" type="BLOB" default=""/> <index name="SMILES_STRING_INDEX"> --- 120,126 ---- *************** *** 257,260 **** --- 258,262 ---- <column name="MOLECULE_ID" required="true" type="INTEGER"/> <column name="HOSE_CODE" required="true" type="VARCHAR" size="120"/> + <column name="HOSE_CODE_WITH_RINGS" required="true" type="VARCHAR" size="120"/> <column name="ATOMIC_MASS" required="true" type="INTEGER"/> <column name="FORMAL_CHARGE" required="true" type="INTEGER"/> *************** *** 643,652 **** </table> <table name="SAMPLE" javaName="DBSample" idMethod="IdBroker"> <column name="SAMPLE_ID" required="true" type="INTEGER" primaryKey="true"/> <column name="USERS_ID" required="true" type="VARCHAR" size="20"/> <column name="USER_ID" required="true" type="INTEGER"/> <column name="SOLVENT" required="true" type="INTEGER"/> ! <column name="FIELD_STRENGTH" required="true" type="INTEGER"/> <column name="PROBABLE_STRUCTURE" required="false" type="INTEGER"/> <column name="DATE" required="true" type="DATE"/> --- 645,664 ---- </table> + <table name="MACHINE" javaName="DBMachine" idMethod="IdBroker"> + <column name="MACHINE_ID" required="true" type="INTEGER" primaryKey="true"/> + <column name="NAME" required="true" type="VARCHAR" size="20"/> + <column name="FIELD_STRENGTH" required="true" type="INTEGER"/> + <foreign-key foreignTable="CONDITION"> + <reference local="FIELD_STRENGTH" foreign="CONDITION_ID"/> + </foreign-key> + </table> + <table name="SAMPLE" javaName="DBSample" idMethod="IdBroker"> <column name="SAMPLE_ID" required="true" type="INTEGER" primaryKey="true"/> <column name="USERS_ID" required="true" type="VARCHAR" size="20"/> + <column name="USERS_ID_COMMENT" required="true" type="VARCHAR" size="40"/> <column name="USER_ID" required="true" type="INTEGER"/> <column name="SOLVENT" required="true" type="INTEGER"/> ! <column name="MACHINE" required="true" type="INTEGER"/> <column name="PROBABLE_STRUCTURE" required="false" type="INTEGER"/> <column name="DATE" required="true" type="DATE"/> *************** *** 656,659 **** --- 668,675 ---- <column name="OTHER_WISHED_SPECTRUM" required="true" type="VARCHAR" size="50"/> <column name="FINISHED" required="true" type="VARCHAR" size="8"/> + <column name="PROCESS" required="true" type="VARCHAR" size="8"/> + <column name="ATTACHMENT" required="true" type="BLOB"/> + <column name="ATTACHMENT_NAME" required="true" type="VARCHAR" size="20"/> + <index name="USER_ID_INDEX"> <index-column name="USER_ID"/> *************** *** 665,670 **** <reference local="SOLVENT" foreign="CONDITION_ID"/> </foreign-key> ! <foreign-key foreignTable="CONDITION"> ! <reference local="FIELD_STRENGTH" foreign="CONDITION_ID"/> </foreign-key> <foreign-key foreignTable="MOLECULE"> --- 681,686 ---- <reference local="SOLVENT" foreign="CONDITION_ID"/> </foreign-key> ! <foreign-key foreignTable="MACHINE"> ! <reference local="MACHINE" foreign="MACHINE_ID"/> </foreign-key> <foreign-key foreignTable="MOLECULE"> *************** *** 678,681 **** --- 694,698 ---- <column name="URL" required="true" type="VARCHAR" size="255"/> <column name="CONTAINED_FILES" required="true" type="LONGVARCHAR"/> + <column name="ASSIGNED" required="true" type="VARCHAR" size="255"/> <foreign-key foreignTable="SAMPLE"> <reference local="SAMPLE_ID" foreign="SAMPLE_ID"/> |
|
From: Stefan K. <sh...@us...> - 2006-11-23 23:56:53
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/reports In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv18196/src/reports Modified Files: yearly_report_1.jasper yearly_report_1.jrxml Log Message: cool report now Index: yearly_report_1.jasper =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/reports/yearly_report_1.jasper,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 Binary files /tmp/cvsq7kFcC and /tmp/cvsauT4sF differ Index: yearly_report_1.jrxml =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/reports/yearly_report_1.jrxml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** yearly_report_1.jrxml 18 Nov 2006 17:03:12 -0000 1.2 --- yearly_report_1.jrxml 23 Nov 2006 23:56:49 -0000 1.3 *************** *** 4,16 **** <jasperReport name="Unnamed" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="30" bottomMargin="30"> ! <property name="com.jasperassistant.designer.Grid" value="false"/> ! <property name="com.jasperassistant.designer.SnapToGrid" value="false"/> <property name="com.jasperassistant.designer.GridWidth" value="12"/> <property name="com.jasperassistant.designer.GridHeight" value="12"/> <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"/> --- 4,17 ---- <jasperReport name="Unnamed" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="30" bottomMargin="30"> ! <property name="com.jasperassistant.designer.Grid" value="true"/> ! <property name="com.jasperassistant.designer.SnapToGrid" value="true"/> <property name="com.jasperassistant.designer.GridWidth" value="12"/> <property name="com.jasperassistant.designer.GridHeight" value="12"/> <property name="com.jasperassistant.designer.DataSource" value="nmrshiftdb"/> + <parameter name="HEADER" class="java.lang.String"/> <queryString> ! <![CDATA[select YEAR(DATE) as YEAR, AFFILIATION_1, AFFILIATION_2, MACHINE.NAME as NAME, count(*) as C, sum(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, sum(WISHED_SPECTRUM like "%H,H-COSY%" or WISHED_SPECTRUM like "%NOESY%" or WISHED_SPECTRUM like "%HMQC%" or WISHED_SPECTRUM like "%HMBC%") as 2_D, sum(OTHER_WISHED_SPECTRUM!="") as SPECIAL, sum(OTHER_NUCLEI!="") as HETERO from (SAMPLE join TURBINE_USER using (USER_ID)) join MACHINE on MACHINE.MACHINE_ID=SAMPLE.MACHINE group by YEAR, AFFILIATION_1, AFFILIATION_2, MACHINE.NAME;]]> </queryString> ! <field name="1_D" class="java.lang.Integer"/> <field name="2_D" class="java.lang.Long"/> <field name="AFFILIATION_2" class="java.lang.String"/> *************** *** 18,36 **** <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"> --- 19,39 ---- <field name="HETERO" class="java.lang.Long"/> <field name="SPECIAL" class="java.lang.Long"/> ! <field name="NAME" class="java.lang.String"/> <field name="YEAR" class="java.lang.Long"/> ! <field name="C" class="java.lang.Integer"/> ! <variable name="GRP_AFFILIATION_2_Sum" class="java.lang.Integer" resetType="Group" resetGroup="GRP_AFFILIATION_2" calculation="Sum"> ! <variableExpression><![CDATA[$F{C}]]></variableExpression> </variable> ! <variable name="GRP_AFFILIATION_1_Sum" class="java.lang.Integer" resetType="Group" resetGroup="GRP_AFFILIATION_1" calculation="Sum"> ! <variableExpression><![CDATA[$F{C}]]></variableExpression> </variable> ! <variable name="GRP_YEAR_Sum" class="java.lang.Integer" resetType="Group" resetGroup="GRP_YEAR" calculation="Sum"> ! <variableExpression><![CDATA[$F{C}]]></variableExpression> </variable> ! <variable name="TOTAL_Sum" class="java.lang.Integer" calculation="Sum"> ! <variableExpression><![CDATA[$F{C}]]></variableExpression> </variable> <group name="GRP_YEAR"> + <groupExpression><![CDATA[$F{YEAR}]]></groupExpression> <groupHeader> <band height="34"> *************** *** 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> --- 43,52 ---- </line> <textField> ! <reportElement x="24" y="12" width="80" height="20"/> <textElement textAlignment="Left"/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{YEAR}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="0" y="12" width="23" height="20"/> <textElement/> <text><![CDATA[Year]]></text> *************** *** 52,68 **** </groupHeader> <groupFooter> ! <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> --- 55,71 ---- </groupHeader> <groupFooter> ! <band height="25"> <textField> ! <reportElement x="144" y="0" width="80" height="20"/> <textElement/> ! <textFieldExpression class="java.lang.Integer"><![CDATA[$V{GRP_YEAR_Sum}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="0" y="0" width="88" height="20"/> <textElement/> <text><![CDATA[Measurements in]]></text> </staticText> <textField> ! <reportElement x="96" y="0" width="37" height="20"/> <textElement textAlignment="Left"/> <textFieldExpression class="java.lang.Long"><![CDATA[$F{YEAR}]]></textFieldExpression> *************** *** 87,103 **** </groupHeader> <groupFooter> ! <band height="41"> <textField> ! <reportElement x="66" y="28" width="80" height="13"/> <textElement/> ! <textFieldExpression class="java.lang.Integer"><![CDATA[$V{GRP_AFFILIATION_1_COUNT}]]></textFieldExpression> </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> --- 90,106 ---- </groupHeader> <groupFooter> ! <band height="31"> <textField> ! <reportElement x="60" y="12" width="80" height="13"/> <textElement/> ! <textFieldExpression class="java.lang.Integer"><![CDATA[$V{GRP_AFFILIATION_1_Sum}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="60" y="0" width="86" height="15"/> <textElement/> <text><![CDATA[Measurements of]]></text> </staticText> <textField> ! <reportElement x="156" y="0" width="330" height="14"/> <textElement/> <textFieldExpression class="java.lang.String"><![CDATA[$F{AFFILIATION_1}]]></textFieldExpression> *************** *** 118,201 **** </groupHeader> <groupFooter> ! <band height="45"> <textField> ! <reportElement x="65" y="31" width="80" height="14"/> <textElement/> ! <textFieldExpression class="java.lang.Integer"><![CDATA[$V{GRP_AFFILIATION_2_COUNT}]]></textFieldExpression> </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> </staticText> </band> </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> --- 121,203 ---- </groupHeader> <groupFooter> ! <band height="56"> <textField> ! <reportElement x="60" y="24" width="80" height="14"/> <textElement/> ! <textFieldExpression class="java.lang.Integer"><![CDATA[$V{GRP_AFFILIATION_2_Sum}]]></textFieldExpression> </textField> <textField> ! <reportElement x="156" y="12" width="330" height="14"/> <textElement/> <textFieldExpression class="java.lang.String"><![CDATA[$F{AFFILIATION_2}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="60" y="12" width="86" height="15"/> <textElement/> <text><![CDATA[Measurements of]]></text> </staticText> + <line> + <reportElement x="60" y="48" width="488" height="4"/> + <graphicElement pen="4Point"/> + </line> </band> </groupFooter> </group> <group name="GROUP_FREQ"> ! <groupExpression><![CDATA[$F{NAME}]]></groupExpression> <groupHeader> ! <band height="51"> <textField> ! <reportElement x="168" y="0" width="27" height="20"/> <textElement/> ! <textFieldExpression class="java.lang.String"><![CDATA[$F{NAME}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="120" y="0" width="43" height="20"/> <textElement/> ! <text><![CDATA[Machine:]]></text> </staticText> <staticText> ! <reportElement x="120" y="24" width="19" height="20"/> <textElement/> <text><![CDATA[1D:]]></text> </staticText> <textField> ! <reportElement x="144" y="24" width="25" height="18"/> <textElement/> ! <textFieldExpression class="java.lang.Integer"><![CDATA[$F{1_D}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="192" y="24" width="18" height="20"/> <textElement/> <text><![CDATA[2D:]]></text> </staticText> <textField> ! <reportElement x="216" y="24" width="25" height="20"/> <textElement/> ! <textFieldExpression class="java.lang.Long"><![CDATA[$F{2_D}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="264" y="24" width="40" height="20"/> <textElement/> <text><![CDATA[Special:]]></text> </staticText> <textField> ! <reportElement x="312" y="24" width="25" height="20"/> <textElement/> ! <textFieldExpression class="java.lang.Long"><![CDATA[$F{SPECIAL}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="360" y="24" width="37" height="20"/> <textElement/> <text><![CDATA[Hetero:]]></text> </staticText> <textField> ! <reportElement x="408" y="24" width="25" height="20"/> <textElement/> ! <textFieldExpression class="java.lang.Long"><![CDATA[$F{HETERO}]]></textFieldExpression> </textField> <line> ! <reportElement x="120" y="0" width="435" height="1"/> <graphicElement/> </line> *************** *** 203,219 **** </groupHeader> <groupFooter> ! <band height="43"> <textField> ! <reportElement x="116" y="30" width="80" height="13"/> <textElement/> ! <textFieldExpression class="java.lang.Integer"><![CDATA[$V{GROUP_FREQ_COUNT}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="117" y="10" width="320" height="14"/> <textElement/> ! <text><![CDATA[Measurements with this frequency:]]></text> </staticText> </band> </groupFooter> </group> </jasperReport> --- 205,264 ---- </groupHeader> <groupFooter> ! <band height="33"> <textField> ! <reportElement x="120" y="12" width="80" height="13"/> <textElement/> ! <textFieldExpression class="java.lang.Integer"><![CDATA[$F{C}]]></textFieldExpression> </textField> <staticText> ! <reportElement x="120" y="0" width="320" height="13"/> <textElement/> ! <text><![CDATA[Measurements with this machine:]]></text> </staticText> </band> </groupFooter> </group> + <pageHeader> + <band height="23"> + <rectangle> + <reportElement x="1" y="0" width="555" height="23" backcolor="#5D5DD7"/> + <graphicElement pen="None"/> + </rectangle> + <textField> + <reportElement x="1" y="1" width="416" height="20"/> + <textElement> + <font size="16" isBold="true"/> + </textElement> + <textFieldExpression class="java.lang.String"><![CDATA[$P{HEADER}]]></textFieldExpression> + </textField> + </band> + </pageHeader> + <pageFooter> + <band height="22"> + <staticText> + <reportElement x="276" y="0" width="25" height="19"/> + <textElement/> + <text><![CDATA[Page]]></text> + </staticText> + <textField> + <reportElement x="300" y="0" width="80" height="20"/> + <textElement/> + <textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> + </textField> + </band> + </pageFooter> + <lastPageFooter> + <band height="26"> + <staticText> + <reportElement x="0" y="0" width="93" height="20"/> + <textElement/> + <text><![CDATA[All measurements:]]></text> + </staticText> + <textField> + <reportElement x="96" y="0" width="80" height="20"/> + <textElement/> + <textFieldExpression class="java.lang.Integer"><![CDATA[$V{TOTAL_Sum}]]></textFieldExpression> + </textField> + </band> + </lastPageFooter> </jasperReport> |
|
From: Stefan K. <sh...@us...> - 2006-11-21 13:01:46
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/portlets In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25672/src/java/org/openscience/nmrshiftdb/portlets Modified Files: ResultPortlet.java Log Message: corrects bugs Index: ResultPortlet.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/portlets/ResultPortlet.java,v retrieving revision 1.289 retrieving revision 1.290 diff -C2 -r1.289 -r1.290 *** ResultPortlet.java 20 Nov 2006 14:12:45 -0000 1.289 --- ResultPortlet.java 21 Nov 2006 13:01:40 -0000 1.290 *************** *** 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 --- 122,126 ---- ex.printStackTrace(); } ! return(new StringElement("<head><meta HTTP-EQUIV=\"REFRESH\" content=\"0; url=NMR+lab+administration;jsessionid="+runData.getSession().getId()+"?nmrshiftdbaction=submitfromlabjournal&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-21 13:01:45
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25672/src/java/org/openscience/nmrshiftdb/modules/actions/portlets Modified Files: OrderAction.java Log Message: corrects bugs Index: OrderAction.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderAction.java,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -r1.47 -r1.48 *** OrderAction.java 21 Nov 2006 10:40:25 -0000 1.47 --- OrderAction.java 21 Nov 2006 13:01:39 -0000 1.48 *************** *** 261,278 **** 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 && !data.getParameters().getString("probablestructure").equals("")){ ! 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"); --- 261,282 ---- context.put("data",data); //this is for the submit from url ! if(data.getParameters().getString("nmrshiftdbaction","").equals("submitfromlabjournal")){ ! 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 && !data.getParameters().getString("probablestructure").equals("")){ ! 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"); ! } }else{ context.put("imagefile", "none"); *************** *** 432,435 **** --- 436,440 ---- sample.save(); } + System.err.println("_"+message+"_"); if(!message.equals("")){ context.put("ordertype",data.getParameters().get("process")); *************** *** 464,467 **** --- 469,474 ---- String message=""; DBSample sample=DBSamplePeer.retrieveByPK(new NumberKey(data.getParameters().get("editid"))); + sample.setUsersId(data.getParameters().get("sampleid")); + sample.setUsersIdComment(data.getParameters().get("sampleidcomment")); DBCondition solvent; if(data.getParameters().get("solvent")!=null && !data.getParameters().get("solvent").equals("")){ *************** *** 527,530 **** --- 534,539 ---- if(data.getParameters().get("othertext")!=null && !data.getParameters().get("othertext").equals("")){ sample.setOtherWishedSpectrum(data.getParameters().get("othertext")); + }else{ + sample.setOtherWishedSpectrum(""); } if(wishedSpectrum.equals("")){ *************** *** 533,537 **** 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")); --- 542,546 ---- sample.save(); } ! if(!message.equals("")){ context.put("ordertype",data.getParameters().get("process")); context.put("usersid",data.getParameters().get("sampleid")); *************** *** 606,610 **** context.put("nuclei",""); context.put("strength",sample.getMachine()); - System.err.println("_"+sample.getProbableStructure()+"_"); if(!(sample.getProbableStructure()+"").equals("")){ //The mol is put into the MView applet via a file --- 615,618 ---- |
|
From: Stefan K. <sh...@us...> - 2006-11-21 13:01:44
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25672/src/vmtemplates/portlets/html Modified Files: user-order.vm Log Message: corrects bugs Index: user-order.vm =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html/user-order.vm,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -r1.52 -r1.53 *** user-order.vm 20 Nov 2006 14:12:45 -0000 1.52 --- user-order.vm 21 Nov 2006 13:01:41 -0000 1.53 *************** *** 128,132 **** 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> <br> --- 128,132 ---- Name: $data.getUser().getFirstName() $data.getUser().getLastName()<br> Institute/Workgroup: $data.getUser().getAffiliation1()/$data.getUser().getAffiliation2()<br> ! Sample I. D.: #if($submitorshow=="submit" || $submitorshow=="edit")<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> <br> |
|
From: Stefan K. <sh...@us...> - 2006-11-21 10:40:27
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30035/src/java/org/openscience/nmrshiftdb/modules/actions/portlets Modified Files: OrderAction.java Log Message: solves a bug Index: OrderAction.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderAction.java,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -r1.46 -r1.47 *** OrderAction.java 20 Nov 2006 14:27:57 -0000 1.46 --- OrderAction.java 21 Nov 2006 10:40:25 -0000 1.47 *************** *** 414,417 **** --- 414,419 ---- if(data.getParameters().get("othertext")!=null && !data.getParameters().get("othertext").equals("")){ sample.setOtherWishedSpectrum(data.getParameters().get("othertext")); + }else{ + sample.setOtherWishedSpectrum(""); } Criteria crit2=new Criteria(); |
|
From: Stefan K. <sh...@us...> - 2006-11-20 15:23:35
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/webservices In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23985/src/java/org/openscience/nmrshiftdb/webservices Modified Files: NMRShiftDBServiceBindingImpl.java Log Message: corrected error with submitting h spectra via web service Index: NMRShiftDBServiceBindingImpl.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/webservices/NMRShiftDBServiceBindingImpl.java,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -r1.36 -r1.37 *** NMRShiftDBServiceBindingImpl.java 16 Nov 2006 10:49:38 -0000 1.36 --- NMRShiftDBServiceBindingImpl.java 20 Nov 2006 15:23:10 -0000 1.37 *************** *** 249,252 **** --- 249,253 ---- subData.getMolWithHCount().getAtom(k).setID(cmlmol.getAtom(k).getId()); } + //build the signalstable CMLElements<CMLPeak> peaks=spectrum.getPeakListElements().get(0).getPeakElements(); for(int k=0;k<peaks.size();k++){ *************** *** 262,271 **** for(int l=0;l<atomrefs.length;l++){ IAtom atom=AtomContainerManipulator.getAtomById(subData.getMolWithH(),atomrefs[l]); if(subData.getChoosenSpectrumType().getName().equals("1H") && !atom.getSymbol().equals("H")){ Iterator it=subData.getMolWithH().getConnectedAtomsList(atom).iterator(); while(it.hasNext()){ IAtom connatom=(IAtom)it.next(); ! if(connatom.getSymbol().equals("H")){ vt.atoms.add(connatom); } } --- 263,275 ---- for(int l=0;l<atomrefs.length;l++){ IAtom atom=AtomContainerManipulator.getAtomById(subData.getMolWithH(),atomrefs[l]); + //in case proton shifts are assigned to heavy atoms, move them to protons if(subData.getChoosenSpectrumType().getName().equals("1H") && !atom.getSymbol().equals("H")){ Iterator it=subData.getMolWithH().getConnectedAtomsList(atom).iterator(); while(it.hasNext()){ IAtom connatom=(IAtom)it.next(); ! if(connatom.getSymbol().equals("H") && !connatom.getFlag(4711)){ vt.atoms.add(connatom); + connatom.setFlag(4711,true); + break; } } *************** *** 277,280 **** --- 281,288 ---- } } + Iterator it=subData.getMolWithH().atoms(); + while(it.hasNext()){ + ((IAtom)it.next()).setFlag(4711,false); + } for (int l = 0; l < subData.getConditions().size(); l++) { Elements els=spectrum.getConditionListElements().get(0).getChildCMLElements("scalar"); |
|
From: Stefan K. <sh...@us...> - 2006-11-20 14:28:09
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv389/src/java/org/openscience/nmrshiftdb/modules/actions/portlets Modified Files: OrderAction.java Log Message: solves a bug Index: OrderAction.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderAction.java,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -r1.45 -r1.46 *** OrderAction.java 20 Nov 2006 14:12:45 -0000 1.45 --- OrderAction.java 20 Nov 2006 14:27:57 -0000 1.46 *************** *** 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); --- 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); |
