Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6247/src/java/org/openscience/nmrshiftdb/modules/actions/portlets
Modified Files:
OrderAction.java OrderFullfillAction.java
Log Message:
the new affiliations are entered/edited along user data input
Index: OrderAction.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderAction.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** OrderAction.java 17 Nov 2006 20:18:09 -0000 1.41
--- OrderAction.java 18 Nov 2006 17:03:12 -0000 1.42
***************
*** 586,590 ****
Vector v=BasePeer.executeQuery("select count(*) from SAMPLE where DATE>='"+fromyear+"-"+frommonth+"-1' and DATE<='"+toyear+"-"+tomonth+"-1'");
context.put("allinst", ((Record)v.get(0)).getValue(1).asInt());
! context.put("aff1",BasePeer.executeQuery("select count(*), AFFILITATION_1 from SAMPLE join TURBINE_USER using (USER_ID) where DATE>='"+fromyear+"-"+frommonth+"-1' and DATE<='"+toyear+"-"+tomonth+"-1' group by AFFILITATION_1"));
--- 586,590 ----
Vector v=BasePeer.executeQuery("select count(*) from SAMPLE where DATE>='"+fromyear+"-"+frommonth+"-1' and DATE<='"+toyear+"-"+tomonth+"-1'");
context.put("allinst", ((Record)v.get(0)).getValue(1).asInt());
! context.put("aff1",BasePeer.executeQuery("select count(*), AFFILIATION_1 from SAMPLE join TURBINE_USER using (USER_ID) where DATE>='"+fromyear+"-"+frommonth+"-1' and DATE<='"+toyear+"-"+tomonth+"-1' group by AFFILIATION_1"));
Index: OrderFullfillAction.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderFullfillAction.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** OrderFullfillAction.java 17 Nov 2006 20:18:09 -0000 1.27
--- OrderFullfillAction.java 18 Nov 2006 17:03:12 -0000 1.28
***************
*** 86,89 ****
--- 86,92 ----
}
context.put("months", months);
+ Vector reporttypes=new Vector();
+ reporttypes.add(new Integer(1));
+ context.put("types",reporttypes);
if(data.getParameters().get("submitorshow")!=null && data.getParameters().get("submitorshow").equals("show")){
DBSample toshow=DBSamplePeer.retrieveByPK(new NumberKey(data.getParameters().get("id")));
|
