Changeset 3791


Ignore:
Timestamp:
Aug 25, 2010, 8:57:25 AM (13 years ago)
Author:
Gregory Vincic
Message:

Refs #698. Removed newExternalId(), getSampleForm() in FormFactory?. Also adding SampleForm? with additional Fields. Modified Sample related actions to use SampleForm?.

Location:
trunk/client/servlet
Files:
2 added
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/client/servlet/src/org/proteios/action/sample/AddSample.java

    r2578 r3791  
    3737import org.proteios.core.SharedItem;
    3838import org.proteios.core.User;
    39 import org.proteios.gui.form.Form;
    40 import org.proteios.gui.form.FormFactory;
     39import org.proteios.gui.form.*;
    4140import org.proteios.util.ShareableUtil;
    4241
    … …  
    5857  {
    5958    // Verify form
    60     Form form = getFormFactory().getSampleForm(null);
     59    Form form = new SampleForm();
    6160    verifyParameters(form);
    6261    // All is ok, get the values
    … …  
    6564    Sample sample = factory.create(Sample.class);
    6665    //
    67     String name = getString(FormFactory.VNAME);
     66    String name = getString(NameField.VPARAM);
    6867    sample.setName(name);
    6968    //
    70     sample.setExternalId(getString(FormFactory.VEXTERNALID));
     69    sample.setExternalId(getString(ExternalIdField.VPARAM));
    7170    //
    72     String description = getString(FormFactory.VDESCR);
     71    String description = getString(DescriptionField.VPARAM);
    7372    sample.setDescription(description);
    7473    //
    75     String storageLocation = getString(FormFactory.VSTORAGELOCATION);
     74    String storageLocation = getString(StorageLocationField.VPARAM);
    7675    sample.setStorageLocation(storageLocation);
    7776    //
    78     Float originalQuantity = getFloat(FormFactory.VORIGINALQUANTITY);
     77    Float originalQuantity = getFloat(OriginalQuantityField.VPARAM);
    7978    sample.setOriginalQuantityInMicroLiters(originalQuantity);
    8079    //
    81     Float concentration = getValidFloat(FormFactory.VCONCENTRATION);
     80    Float concentration = getValidFloat(ConcentrationField.VPARAM);
    8281    sample.setConcentrationInGramsPerLiter(concentration);
    8382    User owner = getOwner();

  • trunk/client/servlet/src/org/proteios/action/sample/NewSample.java

    r2739 r3791  
    3737import org.proteios.gui.Toolbar;
    3838import org.proteios.gui.form.Form;
     39import org.proteios.gui.form.SampleForm;
    3940import org.proteios.gui.layout.RowLayout;
    4041
    … …  
    6768    // Create
    6869    layout = getLayoutFactory().getRowLayout();
    69     form = getFormFactory().getSampleForm(null);
     70    form = new SampleForm();
    7071    toolbar = new Toolbar();
    7172    save = getActionFactory().getActionLink(AddSample.class, "Save");

  • trunk/client/servlet/src/org/proteios/action/sample/SaveSample.java

    r2554 r3791  
    3333import org.proteios.core.Sample;
    3434import org.proteios.core.UpdateEvent;
    35 import org.proteios.gui.form.Form;
    36 import org.proteios.gui.form.FormFactory;
     35import org.proteios.gui.form.*;
    3736import se.lu.thep.waf.ActionException;
    3837import se.lu.thep.waf.constraints.InvalidParameterValue;
    … …  
    4847      throws ActionException, InvalidParameterValue
    4948  {
    50     Form form = getFormFactory().getSampleForm(null);
     49    Form form = new SampleForm();
    5150    verifyParameters(form);
    5251    // All is ok, get the values
    53     Integer sampleId = getInteger(FormFactory.VID);
     52    Integer sampleId = getInteger(ItemIdField.VPARAM);
    5453    DbControl dc = newDbControl();
    5554    Sample sample = getItemFactory(dc).getById(Sample.class, sampleId);
    … …  
    5857    Sample oldSample = getItemFactory(dc2).getById(Sample.class, sampleId);
    5958    //
    60     String name = getString(FormFactory.VNAME);
     59    String name = getString(NameField.VPARAM);
    6160    sample.setName(name);
    6261    //
    63     String externalId = getString(FormFactory.VEXTERNALID);
     62    String externalId = getString(ExternalIdField.VPARAM);
    6463    sample.setExternalId(externalId);
    6564    //
    66     String description = getString(FormFactory.VDESCR);
     65    String description = getString(DescriptionField.VPARAM);
    6766    sample.setDescription(description);
    6867    //
    69     String storageLocation = getString(FormFactory.VSTORAGELOCATION);
     68    String storageLocation = getString(StorageLocationField.VPARAM);
    7069    sample.setStorageLocation(storageLocation);
    7170    //
    72     Float originalQuantity = getValidFloat(FormFactory.VORIGINALQUANTITY);
     71    Float originalQuantity = getValidFloat(OriginalQuantityField.VPARAM);
    7372    sample.setOriginalQuantityInMicroLiters(originalQuantity);
    7473    //
    75     Float concentration = getValidFloat(FormFactory.VCONCENTRATION);
     74    Float concentration = getValidFloat(ConcentrationField.VPARAM);
    7675    sample.setConcentrationInGramsPerLiter(concentration);
    7776    //
    78     Float remainingQuantity = getValidFloat(FormFactory.VREMAININGQUANTITY);
     77    Float remainingQuantity = getValidFloat(RemainingQuantityField.VPARAM);
    7978    sample.setRemainingQuantityInMicroLiters(remainingQuantity);
    8079    /***********************************************************************

  • trunk/client/servlet/src/org/proteios/action/sample/ViewActiveSample.java

    r3030 r3791  
    5252import org.proteios.gui.Title;
    5353import org.proteios.gui.Toolbar;
    54 import org.proteios.gui.form.Form;
    55 import org.proteios.gui.form.FormFactory;
     54import org.proteios.gui.form.*;
    5655import org.proteios.gui.layout.RowLayout;
    5756import org.proteios.gui.table.Cell;
    … …  
    181180
    182181    eventAction = getActionFactory().getActionLink(ViewEvent.class, "View");
    183     eventAction.addParameter(FormFactory.VID, event.getId());
     182    eventAction.addParameter(ItemIdField.VPARAM, event.getId());
    184183    row.setActionLink(eventAction);
    185184    table.addRow(row);
    … …  
    236235      fileLink.disable();
    237236    }
    238     fileLink.addParameter(FormFactory.VBIOMATERIALID, sample.getId());
     237    fileLink.addParameter(BioMaterialIdField.VPARAM, sample.getId());
    239238    toolbar.add(fileLink);
    240239    return table;
    … …  
    330329
    331330    // Create
    332     form = getFormFactory().getSampleForm(sample);
     331    form = new SampleForm(sample);
    333332    toolbar = createSampleFormToolbar(factory, sample);
    334333

  • trunk/client/servlet/src/org/proteios/gui/form/ConcentrationField.java

    r3404 r3791  
    3333 extends TextField<Float>
    3434{
    35   public static final VFloat VCONCENTRATION = new VFloat("concentration", false);
     35  public static final VFloat VPARAM = new VFloat("concentration", false);
    3636
    3737 public ConcentrationField()
    3838 {
    39   super(ConcentrationField.VCONCENTRATION);
    40   this.setLabel("ConcentrationInGramsPerLiter");
     39  super(ConcentrationField.VPARAM);
     40  setLabel("ConcentrationInGramsPerLiter");
     41  setHelp("Grams protein/liter");
    4142 }
    4243}

  • trunk/client/servlet/src/org/proteios/gui/form/DescriptionField.java

    r3404 r3791  
    3333 extends TextArea
    3434{
    35   public static final VString VDESCRIPTION = new VString("description", 0, 255);
     35  public static final VString VPARAM = new VString("description", 0, 255);
    3636
    3737 public DescriptionField()
    3838 {
    39   super(DescriptionField.VDESCRIPTION);
     39  super(DescriptionField.VPARAM);
    4040  this.setLabel("Description");
    4141 }

  • trunk/client/servlet/src/org/proteios/gui/form/ExternalIdField.java

    r3404 r3791  
    3333 extends TextField<String>
    3434{
    35   public static final VString VEXTERNALID = new VString("externalId", 1, 255, true);
     35  public static final VString VPARAM = new VString("externalId", 1, 255,  true);
    3636
    3737 public ExternalIdField()
    3838 {
    39   super(ExternalIdField.VEXTERNALID);
    40   this.setLabel("ExternalId");
     39  super(ExternalIdField.VPARAM);
     40  setLabel("ExternalId");
     41  setHelp("E.g. Identifier used by third party.");
    4142 }
    4243}

  • trunk/client/servlet/src/org/proteios/gui/form/FormFactory.java

    r3790 r3791  
    303303  public static final VString VRANDOMSTRING = new VString("randomString", 1,
    304304    15, true);
    305   public static final VString VEXTERNALID = new VString("externalId", 1, 255,
    306     true);
     305  public static final VString VEXTERNALID = ExternalIdField.VPARAM;
    307306  public static final VString VSTORAGELOCATION = new VString(
    308307    "storageLocation", 0, 255, false);
    … …  
    597596      fs.add(asPopup);
    598597    }
    599   }
    600 
    601 
    602   public Form getSampleForm(Sample sample)
    603   {
    604     Form form = new Form("sampleForm");
    605     form.setTitle("New sample");
    606     Fieldset properties = new Fieldset();
    607     modifyForPopup(properties);
    608     properties.getLegendTitle().setTitle("Properties");
    609     form.addFieldset(properties);
    610     // Create fields for the properties fieldset
    611     TextField<String> name = new NameField();
    612     properties.add(name);
    613     //
    614     TextField<String> externalIdF = newExternalIdField();
    615     properties.add(externalIdF);
    616     //
    617     TextArea description = newDescriptionField();
    618     properties.add(description);
    619     //
    620     TextField<String> storageLocationF = newStorageLocationField();
    621     properties.add(storageLocationF);
    622     //
    623     Fieldset quantityFS = new Fieldset();
    624     form.addFieldset(quantityFS);
    625     quantityFS.getLegendTitle().setTitle("Quantity");
    626     TextField<Float> concF = newConcentrationField();
    627     quantityFS.add(concF);
    628     TextField<Float> originalQuantityF = newOriginalQuantityField();
    629     quantityFS.add(originalQuantityF);
    630     // Set field values
    631     if (sample != null)
    632     {
    633       // sample id
    634       TextField<Integer> sampleIdF = newHiddenItemIdField();
    635       properties.add(sampleIdF);
    636       sampleIdF.setValue(sample.getId());
    637       name.setValue(sample.getName());
    638       externalIdF.setValue(sample.getExternalId());
    639       description.setValue(sample.getDescription());
    640       storageLocationF.setValue(sample.getStorageLocation());
    641       // Quantity fields
    642       originalQuantityF.setValue(sample
    643         .getOriginalQuantityInMicroLiters());
    644       concF.setValue(sample.getConcentrationInGramsPerLiter());
    645       quantityFS.add(newRemainingQuantityField(sample
    646         .getRemainingQuantityInMicroLiters()));
    647     }
    648     return form;
    649598  }
    650599
    … …  
    92729221    fs.add(nameF);
    92739222    //
    9274     TextField<String> externalIdF = newExternalIdField();
     9223    TextField<String> externalIdF = new ExternalIdField();
    92759224    fs.add(externalIdF);
    92769225    //
    … …  
    93209269    fs.add(nameF);
    93219270    //
    9322     TextField<String> externalIdF = newExternalIdField();
     9271    TextField<String> externalIdF = new ExternalIdField();
    93239272    fs.add(externalIdF);
    93249273    //
    … …  
    93909339    fs.add(nameF);
    93919340    //
    9392     TextField<String> externalIdF = newExternalIdField();
     9341    TextField<String> externalIdF = new ExternalIdField();
    93939342    fs.add(externalIdF);
    93949343    //
    … …  
    96099558  }
    96109559
    9611 
    9612   private TextField<String> newExternalIdField()
    9613   {
    9614     TextField<String> field = new TextField<String>(VEXTERNALID);
    9615     field.setLabel("ExternalId");
    9616   field.setHelp("E.g. Identifier used by third party.");
    9617     return field;
    9618   }
    96199560
    96209561

  • trunk/client/servlet/src/org/proteios/gui/form/NameableProperties.java

    r3790 r3791  
    5656 public void setValues(Nameable obj)
    5757 {
    58   if(itemIdF == null) { itemIdF = new ItemIdField(); }
     58  if(itemIdF == null)
     59  {
     60   itemIdF = new ItemIdField();
     61   add(itemIdF);
     62  }
    5963  itemIdF.setValue(obj.getId());
    6064  this.nameF.setValue(obj.getName());

  • trunk/client/servlet/src/org/proteios/gui/form/OriginalQuantityField.java

    r3404 r3791  
    3333 extends TextField<Float>
    3434{
    35   public static final VFloat VORIGINALQUANTITY  = new VFloat("originalQuantity",  true);
     35  public static final VFloat VPARAM  = new VFloat("originalQuantity",  true);
    3636
    3737 public OriginalQuantityField()
    3838 {
    39   super(OriginalQuantityField.VORIGINALQUANTITY);
    40   this.setLabel("ExtractOriginalQuantity");
     39  super(OriginalQuantityField.VPARAM);
     40  setLabel("ExtractOriginalQuantity");
     41  setHelp("Micro liter");
    4142 }
    4243}

  • trunk/client/servlet/src/org/proteios/gui/form/RemainingQuantityField.java

    r3404 r3791  
    3333 extends TextField<Float>
    3434{
    35  public static final VFloat VREMAININGQUANTITY = new VFloat("remainingQuantity", false);
     35 public static final VFloat VPARAM = new VFloat("remainingQuantity", false);
    3636
    3737 public RemainingQuantityField()
    3838 {
    39   super(RemainingQuantityField.VREMAININGQUANTITY);
     39  super(RemainingQuantityField.VPARAM);
    4040  this.setLabel("Remaining");
    4141 }

  • trunk/client/servlet/src/org/proteios/gui/form/StorageLocationField.java

    r3404 r3791  
    3333 extends TextField<String>
    3434{
    35   public static final VString VSTORAGELOCATION = new VString("storageLocation", 0, 255, false);
     35  public static final VString VPARAM = new VString("storageLocation", 0, 255, false);
    3636
    3737 public StorageLocationField()
    3838 {
    39   super(StorageLocationField.VSTORAGELOCATION);
    40   this.setLabel("StorageLocation");
     39  super(StorageLocationField.VPARAM);
     40  setLabel("StorageLocation");
     41  setHelp("E.g. Fridge X on floor Y");
    4142 }
    4243}

  • trunk/client/servlet/www/static/css/colors.css

    r3759 r3791  
    110110  Error hiliting color for e.g. form fields
    111111*************************************************/
    112 div.form form fieldset div.fields div.field span.fieldError
     112div.form form fieldset div.fields div.field span.fieldError, span.fieldError
    113113{
    114114  color: red;
    … …  
    120120  Required fields
    121121*************************************************/
    122 div.form form fieldset div.fields div.required input, input.required
     122div.form form fieldset div.fields .required input, input.required
    123123{
    124124  background-color: #d0f0ff;
Note: See TracChangeset for help on using the changeset viewer.