Menu
▾
▴
boakeity-source-changes — Commit messages for Boakeity
You can subscribe to this list here.
| 2007 |
Jan
(20) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: Johan T. <jt...@us...> - 2007-01-24 22:40:44
|
Update of /cvsroot/boakeity/boakeity/src/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24619/src/view Modified Files: biobankui.xhtml Log Message: Use textarea for some fields. Index: biobankui.xhtml =================================================================== RCS file: /cvsroot/boakeity/boakeity/src/view/biobankui.xhtml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- biobankui.xhtml 24 Jan 2007 21:31:50 -0000 1.8 +++ biobankui.xhtml 24 Jan 2007 22:40:38 -0000 1.9 @@ -121,11 +121,11 @@ </div> <div> <h:outputLabel for="additionalInformation" class="heading" value="#{msg.AdditionalInformation}"/> - <h:inputText id="additionalInformation" value="#{biobank.additionalInformation}" style="width: 175px;"/> + <h:inputTextarea id="additionalInformation" value="#{biobank.additionalInformation}" class="notefield"/> </div> <div> <h:outputLabel for="note" class="heading" value="#{msg.Note}"/> - <h:inputText id="note" value="#{biobank.note}" style="width: 175px;"/> + <h:inputTextarea id="note" value="#{biobank.note}" class="notefield"/> </div> <div class="errors"> <h:messages globalOnly="true"/> |
|
From: Johan T. <jt...@us...> - 2007-01-24 22:40:44
|
Update of /cvsroot/boakeity/boakeity/src/view/css In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24619/src/view/css Modified Files: screen.css Log Message: Use textarea for some fields. Index: screen.css =================================================================== RCS file: /cvsroot/boakeity/boakeity/src/view/css/screen.css,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- screen.css 27 Nov 2006 14:49:52 -0000 1.2 +++ screen.css 24 Jan 2007 22:40:38 -0000 1.3 @@ -33,6 +33,11 @@ padding: 5px; } +textarea.notefield { + width: 500px; + height: 200px; +} + span.readonlyattribute { font-size: small; } |
|
From: Johan T. <jt...@us...> - 2007-01-24 21:32:38
|
Update of /cvsroot/boakeity/boakeity/src/resources/web/WEB-INF In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28770/src/resources/web/WEB-INF Modified Files: pages.xml Log Message: More fiddling with loading and storing. Mark all factory populated member variables with @Out(required=false) as not all fields will be populated at once, but really one at a time as the JSF-component tree is traversed and each @Factory method is called. Index: pages.xml =================================================================== RCS file: /cvsroot/boakeity/boakeity/src/resources/web/WEB-INF/pages.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pages.xml 20 Nov 2006 12:55:28 -0000 1.1 +++ pages.xml 24 Jan 2007 21:31:50 -0000 1.2 @@ -30,4 +30,8 @@ <param name="pseudoSampleId" value="#{pseudoSampleId}"/> </page> + <page view-id="/biobankui.xhtml" action="#{biobankUiAction.loadBiobank(biobankId)}"> + <param name="biobankId" value="#{biobankId}"/> + </page> + </pages> |
|
From: Johan T. <jt...@us...> - 2007-01-24 21:32:38
|
Update of /cvsroot/boakeity/boakeity/src/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28770/src/view Modified Files: biobankui.xhtml Log Message: More fiddling with loading and storing. Mark all factory populated member variables with @Out(required=false) as not all fields will be populated at once, but really one at a time as the JSF-component tree is traversed and each @Factory method is called. Index: biobankui.xhtml =================================================================== RCS file: /cvsroot/boakeity/boakeity/src/view/biobankui.xhtml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- biobankui.xhtml 17 Jan 2007 22:56:49 -0000 1.7 +++ biobankui.xhtml 24 Jan 2007 21:31:50 -0000 1.8 @@ -131,7 +131,7 @@ <h:messages globalOnly="true"/> </div> <div class="buttonBox"> - <h:commandButton action="#{biobankui.store}" value="#{msg.Save}" class="button" /> + <h:commandButton action="#{biobankUiAction.store}" value="#{msg.Save}" class="button" /> </div> </fieldset> </h:form> |
|
From: Johan T. <jt...@us...> - 2007-01-24 21:31:53
|
Update of /cvsroot/boakeity/boakeity/src/se/biobanksregistersyd/boakeity/action In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28770/src/se/biobanksregistersyd/boakeity/action Modified Files: BiobankUi.java BiobankUiAction.java Log Message: More fiddling with loading and storing. Mark all factory populated member variables with @Out(required=false) as not all fields will be populated at once, but really one at a time as the JSF-component tree is traversed and each @Factory method is called. Index: BiobankUiAction.java =================================================================== RCS file: /cvsroot/boakeity/boakeity/src/se/biobanksregistersyd/boakeity/action/BiobankUiAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- BiobankUiAction.java 17 Jan 2007 22:56:49 -0000 1.5 +++ BiobankUiAction.java 24 Jan 2007 21:31:50 -0000 1.6 @@ -34,11 +34,14 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Begin; import org.jboss.seam.annotations.Factory; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Out; +import org.jboss.seam.annotations.Scope; import org.jboss.seam.core.FacesMessages; import org.jboss.seam.core.ResourceBundle; import org.jboss.seam.log.Log; @@ -47,18 +50,18 @@ /** * Action paired with 'biobankui.xhtml'. - * */ @Stateless -@Name("biobankui") +@Name("biobankUiAction") +@Scope(ScopeType.CONVERSATION) public class BiobankUiAction implements BiobankUi { /** The biobank under edit. */ - @In + @Out @In(create = true) private Biobank biobank; /** A list of possible choices for principalType, for use in JSF. */ - @Out + @Out(required = false) private List < SelectItem > principalTypeList; /** A list of possible choices for biobankType, for use in JSF. */ @@ -78,11 +81,43 @@ private Log log; /** + * Load a <code>Biobank</code>. Due to the page declaration in + * <code>pages.xml</code> this method is always called at every + * request. + * + * @param biobankId a <code>String</code> with the primary key + * of the <code>Biobank</code> to load, or + * <code>null</code> if no <code>Biobank</code> + * should be loaded. + * @throws EntityNotFoundException if unable to load the + * <code>Biobank</code>. + */ + @Begin(join = true) + public void loadBiobank(final String biobankId) + throws EntityNotFoundException { + if (biobankId == null || biobankId.trim().equals("")) { + System.out.println("create?"); + if (biobank == null) { + System.out.println("new Biobank()"); + biobank = new Biobank(); + } + } else { + // Lookup the biobank from the DB. + System.out.println("find"); + biobank = manager.find(Biobank.class, biobankId); + if (biobank == null) { + throw new EntityNotFoundException("Biobank", biobankId); + } + } + } + + /** * Store the edited data to persistent storage. * * @return the JSP page to redirect to. */ public String store() { + System.out.println("biobank: store()"); Biobank biobankP = manager.find(Biobank.class, biobank.getBiobankId()); if (biobankP == null) { manager.persist(biobank); @@ -134,11 +169,11 @@ @Factory("biobankCountryTypeList") public void findCountryTypeList() { biobankCountryTypeList = new ArrayList < SelectItem > (); - String list = ResourceBundle.instance().getString("BiobankCountryTypeList"); + String list = ResourceBundle.instance().getString( + "BiobankCountryTypeList"); for (String type : list.split("\\|")) { String[] tmp = type.split(";"); biobankCountryTypeList.add(new SelectItem(tmp[0], tmp[1])); } } - } Index: BiobankUi.java =================================================================== RCS file: /cvsroot/boakeity/boakeity/src/se/biobanksregistersyd/boakeity/action/BiobankUi.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- BiobankUi.java 17 Jan 2007 22:56:49 -0000 1.5 +++ BiobankUi.java 24 Jan 2007 21:31:50 -0000 1.6 @@ -34,6 +34,18 @@ */ @Local public interface BiobankUi { + + /** + * Load a <code>Biobank</code>. + * + * @param biobankId a <code>String</code> with the primary key + * of the <code>Biobank</code>. + * @throws EntityNotFoundException if unable to load the + * <code>Biobank</code>. + */ + void loadBiobank(final String biobankId) + throws EntityNotFoundException; + /** * Store the edited data to persistent storage. * @@ -58,4 +70,5 @@ * string from message bundles. */ void findCountryTypeList(); + } |
|
From: Johan T. <jt...@us...> - 2007-01-17 22:58:25
|
Update of /cvsroot/boakeity/boakeity/src/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29534/src/view Modified Files: biobankui.xhtml Log Message: Add facility for choosing the country where the biobank resides. Index: biobankui.xhtml =================================================================== RCS file: /cvsroot/boakeity/boakeity/src/view/biobankui.xhtml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- biobankui.xhtml 16 Jan 2007 23:32:23 -0000 1.6 +++ biobankui.xhtml 17 Jan 2007 22:56:49 -0000 1.7 @@ -84,7 +84,9 @@ </div> <div> <h:outputLabel for="country" class="heading" value="#{msg.BiobankCountry}"/> - <h:inputText id="country" value="#{biobank.country}" style="width: 175px;"/> + <h:selectOneMenu id="country" value="#{biobank.country}"> + <f:selectItems value="#{biobankCountryTypeList}" /> + </h:selectOneMenu> </div> <div> <h:outputLabel for="establishDate" class="heading" value="#{msg.EstablishDate}"/> |
|
From: Johan T. <jt...@us...> - 2007-01-17 22:57:39
|
Update of /cvsroot/boakeity/boakeity/src/se/biobanksregistersyd/boakeity/action In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29534/src/se/biobanksregistersyd/boakeity/action Modified Files: BiobankUi.java BiobankUiAction.java Log Message: Add facility for choosing the country where the biobank resides. Index: BiobankUiAction.java =================================================================== RCS file: /cvsroot/boakeity/boakeity/src/se/biobanksregistersyd/boakeity/action/BiobankUiAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- BiobankUiAction.java 16 Jan 2007 23:32:23 -0000 1.4 +++ BiobankUiAction.java 17 Jan 2007 22:56:49 -0000 1.5 @@ -65,6 +65,10 @@ @Out(required = false) private List < SelectItem > biobankTypeList; + /** A list of possible choices for biobankCountryType, for use in JSF. */ + @Out(required = false) + private List < SelectItem > biobankCountryTypeList; + /** Entity manager for entities in the primary database. */ @PersistenceContext(unitName = "boakeity") private EntityManager manager; @@ -123,4 +127,18 @@ } } + /** + * Populates <code>biobankCountryTypeList</code> with internationalised + * string from message bundles. + */ + @Factory("biobankCountryTypeList") + public void findCountryTypeList() { + biobankCountryTypeList = new ArrayList < SelectItem > (); + String list = ResourceBundle.instance().getString("BiobankCountryTypeList"); + for (String type : list.split("\\|")) { + String[] tmp = type.split(";"); + biobankCountryTypeList.add(new SelectItem(tmp[0], tmp[1])); + } + } + } Index: BiobankUi.java =================================================================== RCS file: /cvsroot/boakeity/boakeity/src/se/biobanksregistersyd/boakeity/action/BiobankUi.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- BiobankUi.java 16 Jan 2007 23:32:23 -0000 1.4 +++ BiobankUi.java 17 Jan 2007 22:56:49 -0000 1.5 @@ -52,4 +52,10 @@ * string from message bundles. */ void findBiobankTypeList(); + + /** + * Populates <code>biobankCountryTypeList</code> with internationalised + * string from message bundles. + */ + void findCountryTypeList(); } |
|
From: Johan T. <jt...@us...> - 2007-01-17 22:56:53
|
Update of /cvsroot/boakeity/boakeity/i18n In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29534/i18n Modified Files: messages_en.properties messages_sv.properties Log Message: Add facility for choosing the country where the biobank resides. Index: messages_en.properties =================================================================== RCS file: /cvsroot/boakeity/boakeity/i18n/messages_en.properties,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- messages_en.properties 16 Jan 2007 23:32:23 -0000 1.8 +++ messages_en.properties 17 Jan 2007 22:56:49 -0000 1.9 @@ -43,6 +43,7 @@ BiobankType = Biobank type BiobankTypeList = ;Choose a type|TYP1;Biobank at department for pathology/cytology|TYP2;Biobank at department for clinical chemistry|TYP3;Biobank at department for gynecology/obstetrics|TYP4;Biobank that contains material for IVF and similiar activity|TYP5;Biobank at department for bacteriology/virology|TYP6;Biobank that contains material for transfusion|TYP7;Biobank that contains material for transplantation purposes|TYP8;Other biobank|TYP9;Combination of biobanks BiobankCountry = Biobank country +BiobankCountryTypeList = AD;Andorra|AE;United Arab Emirates|AF;Afghanistan|AG;Antigua and Barbuda|AI;Anguilla|AL;Albania|AM;Armenia|AN;Netherlands Antilles|AO;Angola|AQ;Antarctica|AR;Argentina|AS;American Samoa|AT;Austria|AU;Australia|AW;Aruba|AZ;Azerbaijan|BA;Bosnia and Herzegovina|BB;Barbados|BD;Bangladesh|BE;Belgium|BF;Burkina Faso|BG;Bulgaria|BH;Bahrain|BI;Burundi|BJ;Benin|BM;Bermuda|BN;Brunei|BO;Bolivia|BR;Brazil|BS;Bahamas|BT;Bhutan|BV;Bouvet Island|BW;Botswana|BY;Belarus|BZ;Belize|CA;Canada|CC;Cocos (Keeling) Islands|CF;Central African Republic|CG;Republic of the Congo|CH;Switzerland|CI;Côte|CK;Cook Islands|CL;Chile|CM;Cameroon|CN;People's Republic of China|CO;Colombia|CR;Costa Rica|CU;Cuba|CV;Cape Verde|CX;Christmas Island|CY;Cyprus|CZ;Czech Republic|DE;Germany|DJ;Djibouti|DK;Denmark|DM;Dominica|DO;Dominican Republic|DZ;Algeria|EC;Ecuador|EE;Estonia|EG;Egypt|EH;Western Sahara|ER;Eritrea|ES;Spain|ET;Ethiopia|FI;Finland|FJ;Fiji|FK;Falkland Islands|FM;Federated States of Micronesia|FO;Faroe Islands|FR;France|GA;Gabon|GB;United Kingdom|GD;Grenada|GE;Georgia|GF;French Guiana|GH;Ghana|GI;Gibraltar|GL;Greenland|GM;Gambia|GN;Guinea|GP;Guadeloupe|GQ;Equatorial Guinea|GR;Greece|GT;Guatemala|GU;Guam|GW;Guinea-Bissau|GY;Guyana|HK;Hong Kong|HM;Heard Island and McDonald Islands|HN;Honduras|HR;Croatia|HT;Haiti|HU;Hungary|ID;Indonesia|IE;Republic of Ireland|IL;Israel|IN;India|IO;British Indian Ocean Territory|IQ;Iraq|IR;Iran|IS;Iceland|IT;Italy|JM;Jamaica|JO;Jordan|JP;Japan|KE;Kenya|KG;Kyrgyzstan|KH;Cambodia|KI;Kiribati|KM;Comoros|KN;Saint Kitts and Nevis|KP;North Korea|KR;South Korea|KW;Kuwait|KY;Cayman Islands|KZ;Kazakhstan|LA;Laos|LB;Lebanon|LC;Saint Lucia|LI;Liechtenstein|LK;Sri Lanka|LR;Liberia|LS;Lesotho|LT;Lithuania|LU;Luxembourg|LV;Latvia|LY;Libya|MA;Morocco|MC;Monaco|MD;Republic of Moldova|ME;Montenegro|MG;Madagascar|MH;Marshall Islands|MK;Republic of Macedonia|ML;Mali|MM;Myanmar|MN;Mongolia|MO;Macau|MP;Northern Mariana Islands|MQ;Martinique|MR;Mauritania|MS;Montserrat|MT;Malta|MU;Mauritius|MV;Maldives|MW;Malawi|MX;Mexico|MY;Malaysia|MZ;Mozambique|NA;Namibia|NC;New Caledonia|NE;Niger|NF;Norfolk Island|NG;Nigeria|NI;Nicaragua|NL;Netherlands|NO;Norway|NP;Nepal|NR;Nauru|NU;Niue|NZ;New Zealand|OM;Oman|PA;Panama|PE;Peru|PF;French Polynesia Includes Clipperton Island|PG;Papua New Guinea|PH;Philippines|PK;Pakistan|PL;Poland|PM;Saint Pierre and Miquelon|PN;Pitcairn Islands|PR;Puerto Rico|PT;Portugal|PW;Palau|PY;Paraguay|QA;Qatar|RE;Réunion|RO;Romania|RS;Serbia|RU;Russia|RW;Rwanda|SA;Saudi Arabia|SB;Solomon Islands|SC;Seychelles|SD;Sudan|SE;Sweden|SG;Singapore|SH;Saint Helena|SI;Slovenia|SJ;Svalbard and Jan Mayen|SK;Slovakia|SL;Sierra Leone|SM;San Marino|SN;Senegal|SO;Somalia|SR;Suriname|ST;Sao Tome and Principe|SV;El Salvador|SY;Syria|SZ;Swaziland|TC;Turks and Caicos Islands|TD;Chad|TF;French Southern Territories|TG;Togo|TH;Thailand|TJ;Tajikistan|TK;Tokelau|TM;Turkmenistan|TN;Tunisia|TO;Tonga|TR;Turkey|TT;Trinidad and Tobago|TV;Tuvalu|TW;Taiwan|TZ;Tanzania|UA;Ukraine|UG;Uganda|UM;United States Minor Outlying Islands|US;United States|UY;Uruguay|UZ;Uzbekistan|VA;Vatican City|VC;Saint Vincent and the Grenadines|VE;Venezuela|VG;British Virgin Islands|VI;United States Virgin Islands|VN;Vietnam|VU;Vanuatu|WF;Wallis and Futuna|WS;Samoa|YE;Yemen|YT;Mayotte|ZA;South Africa|ZM;Zambia|ZW;Zimbabwe EstablishDate = Establish date BiobankResponsible = Biobank responsible AddressResponsibleFirstLine = Address of responsible - first line Index: messages_sv.properties =================================================================== RCS file: /cvsroot/boakeity/boakeity/i18n/messages_sv.properties,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- messages_sv.properties 16 Jan 2007 23:32:23 -0000 1.8 +++ messages_sv.properties 17 Jan 2007 22:56:50 -0000 1.9 @@ -43,6 +43,7 @@ BiobankType = Biobankstyp BiobankTypeList = ;Välj en typ|TYP1;Biobank vid avdelning för patologi/cytologi|TYP2;Biobank vid avdelning för klinisk kemi|TYP3;Biobank vid avdelning för gynekologi/obstetrik|TYP4;Biobank som innehåller material för IVF och liknande verksamhet|TYP5;Biobank vid avdelning för bakteriologi/virologi|TYP6;Biobank som innehåller material för transfusion|TYP7;Biobank som innehåller material för transplantationsändamål|TYP8;Annan biobank|TYP9;Kombination av biobanker BiobankCountry = Biobanksland +BiobankCountryTypeList = AD;Andorra|AE;Förenade arabemiraten|AF;Afghanistan|AG;Antigua och Barbuda|AI;Anguilla|AL;Albanien|AM;Armenien|AN;Nederländska Antillerna|AO;Angola|AQ;Antarktis|AR;Argentina|AS;Amerikanska Samoa|AT;Österrike|AU;Australien|AW;Aruba|AZ;Azerbajdzjan|BA;Bosnien-Hercegovina|BB;Barbados|BD;Bangladesh|BE;Belgien|BF;Burkina Faso|BG;Bulgarien|BH;Bahrain|BI;Burundi|BJ;Benin|BM;Bermuda|BN;Brunei|BO;Bolivia|BR;Brasilien|BS;Bahamas|BT;Bhutan|BV;Bouvetön|BW;Botswana|BY;Vitryssland|BZ;Belize|CA;Kanada|CC;Kokosöarna|CF;Centralafrikanska republiken|CG;Kongo|CH;Schweiz|CI;Elfenbenskusten|CK;Cooköarna|CL;Chile|CM;Kamerun|CN;Kina|CO;Colombia|CR;Costa Rica|CU;Kuba|CV;Kap Verde|CX;Julön|CY;Cypern|CZ;Tjeckien|DE;Tyskland|DJ;Djibouti|DK;Danmark|DM;Dominica|DO;Dominikanska republiken|DZ;Algeriet|EC;Ecuador|EE;Estland|EG;Egypten|EH;Västsahara|ER;Eritrea|ES;Spanien|ET;Etiopien|FI;Finland|FJ;Fiji|FK;Falklandsöarna|FM;Mikronesiens federerade stater|FO;Färöarna|FR;Frankrike|GA;Gabon|GB;Storbritannien|GD;Grenada|GE;Georgien|GF;Franska Guyana|GH;Ghana|GI;Gibraltar|GL;Grönland|GM;Gambia|GN;Guinea|GP;Guadeloupe|GQ;Ekvatorialguinea|GR;Grekland|GT;Guatemala|GU;Guam|GW;Guinea Bissau|GY;Guyana|HK;Hongkong|HM;Heard- och McDonaldsöarna|HN;Honduras|HR;Kroatien|HT;Haiti|HU;Ungern|ID;Indonesien|IE;Irland|IL;Israel|IN;Indien|IO;Brittiska territoriet i Indiska Oceanen|IQ;Irak|IR;Iran|IS;Island|IT;Italien|JM;Jamaica|JO;Jordanien|JP;Japan|KE;Kenya|KG;Kirgizistan|KH;Kambodja|KI;Kiribati|KM;Comorerna|KN;Saint Kitts och Nevis|KP;Nordkorea|KR;Sydkorea|KW;Kuwait|KY;Caymanöarna|KZ;Kazakstan|LA;Laos|LB;Libanon|LC;Saint Lucia|LI;Liechtenstein|LK;Sri Lanka|LR;Liberia|LS;Lesotho|LT;Litauen|LU;Luxemburg|LV;Lettland|LY;Libyen|MA;Marocko|MC;Monaco|MD;Moldavien|ME;Montenegro|MG;Madagaskar|MH;Marshallöarna|MK;Makedonien|ML;Mali|MM;Burma|MN;Mongoliet|MO;Macau|MP;Nordmarianerna|MQ;Martinique|MR;Mauretanien|MS;Montserrat|MT;Malta|MU;Mauritius|MV;Maldiverna|MW;Malawi|MX;Mexiko|MY;Malaysia|MZ;Moçambique|NA;Namibia|NC;Nya Kaledonien|NE;Niger|NF;Norfolkön|NG;Nigeria|NI;Nicaragua|NL;Nederländerna|NO;Norge|NP;Nepal|NR;Nauru|NU;Niue|NZ;Nya Zeeland|OM;Oman|PA;Panama|PE;Peru|PF;Franska Polynesien|PG;Papua Nya Guinea|PH;Filippinerna|PK;Pakistan|PL;Polen|PM;Saint Pierre och Miquelon|PN;Pitcairn|PR;Puerto Rico|PT;Portugal|PW;Palau|PY;Paraguay|QA;Qatar|RE;Reunion|RO;Rumänien|RS;Serbien|RU;Ryssland|RW;Rwanda|SA;Saudiarabien|SB;Salomonöarna|SC;Seychellerna|SD;Sudan|SE;Sverige|SG;Singapore|SH;Sankta Helena|SI;Slovenien|SJ;Svalbard|SK;Slovakien|SL;Sierra Leone|SM;San Marino|SN;Senegal|SO;Somalia|SR;Surinam|ST;São Tomé och Príncipe|SV;El Salvador|SY;Syrien|SZ;Swaziland|TC;Turks och Caicosöarna|TD;Tchad|TF;Franska södra territorierna|TG;Togo|TH;Thailand|TJ;Tadzjikistan|TK;Tokelau|TM;Turkmenistan|TN;Tunisien|TO;Tonga|TR;Turkiet|TT;Trinidad och Tobago|TV;Tuvalu|TW;Taiwan|TZ;Tanzania|UA;Ukraina|UG;Uganda|UM;USA:s yttre öar|US;USA|UY;Uruguay|UZ;Uzbekistan|VA;Vatikanstaten|VC;Saint Vincent och Grenadinerna|VE;Venezuela|VG;Brittiska Jungfruöarna|VI;Jungfruöarna|VN;Vietnam|VU;Vanuatu|WF;Wallis- och Futunaöarna|WS;Samoa|YE;Yemen|YT;Mayotte|ZA;Sydafrika|ZM;Zambia|ZW;Zimbabwe EstablishDate = Inrättandedatum BiobankResponsible = Biobanksansvarig AddressResponsibleFirstLine = Biobanksansvarig, utdelningsadress |
|
From: Johan T. <jt...@us...> - 2007-01-17 22:54:06
|
Update of /cvsroot/boakeity/boakeity/src/se/biobanksregistersyd/boakeity/entity In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28216/src/se/biobanksregistersyd/boakeity/entity Modified Files: Biobank.java Log Message: Add constructor, set default value for country to 'SE'. Index: Biobank.java =================================================================== RCS file: /cvsroot/boakeity/boakeity/src/se/biobanksregistersyd/boakeity/entity/Biobank.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Biobank.java 14 Jan 2007 20:19:49 -0000 1.4 +++ Biobank.java 17 Jan 2007 22:54:01 -0000 1.5 @@ -113,6 +113,13 @@ new ArrayList < BiobankDivision > (); /** + * Public constructor, initialise values. + */ + public Biobank() { + country = "SE"; + } + + /** * Getter for field 'biobankId'. * * @return a <code>String</code> representing the id of the biobank. |
|
From: Johan T. <jt...@us...> - 2007-01-16 23:32:28
|
Update of /cvsroot/boakeity/boakeity/src/se/biobanksregistersyd/boakeity/action In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9054/src/se/biobanksregistersyd/boakeity/action Modified Files: BiobankUi.java BiobankUiAction.java Log Message: Add facility for choosing biobank type. Index: BiobankUiAction.java =================================================================== RCS file: /cvsroot/boakeity/boakeity/src/se/biobanksregistersyd/boakeity/action/BiobankUiAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- BiobankUiAction.java 14 Nov 2006 11:12:33 -0000 1.3 +++ BiobankUiAction.java 16 Jan 2007 23:32:23 -0000 1.4 @@ -60,7 +60,11 @@ /** A list of possible choices for principalType, for use in JSF. */ @Out private List < SelectItem > principalTypeList; - + + /** A list of possible choices for biobankType, for use in JSF. */ + @Out(required = false) + private List < SelectItem > biobankTypeList; + /** Entity manager for entities in the primary database. */ @PersistenceContext(unitName = "boakeity") private EntityManager manager; @@ -104,5 +108,19 @@ principalTypeList.add(new SelectItem(tmp[0], tmp[1])); } } - + + /** + * Populates <code>biobankTypeList</code> with internationalised + * string from message bundles. + */ + @Factory("biobankTypeList") + public void findBiobankTypeList() { + biobankTypeList = new ArrayList < SelectItem > (); + String list = ResourceBundle.instance().getString("BiobankTypeList"); + for (String type : list.split("\\|")) { + String[] tmp = type.split(";"); + biobankTypeList.add(new SelectItem(tmp[0], tmp[1])); + } + } + } Index: BiobankUi.java =================================================================== RCS file: /cvsroot/boakeity/boakeity/src/se/biobanksregistersyd/boakeity/action/BiobankUi.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- BiobankUi.java 14 Nov 2006 11:12:33 -0000 1.3 +++ BiobankUi.java 16 Jan 2007 23:32:23 -0000 1.4 @@ -46,4 +46,10 @@ * string from message bundles. */ void findPrincipalTypeList(); + + /** + * Populates <code>biobankTypeList</code> with internationalised + * string from message bundles. + */ + void findBiobankTypeList(); } |
|
From: Johan T. <jt...@us...> - 2007-01-16 23:32:28
|
Update of /cvsroot/boakeity/boakeity/src/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9054/src/view Modified Files: biobankui.xhtml Log Message: Add facility for choosing biobank type. Index: biobankui.xhtml =================================================================== RCS file: /cvsroot/boakeity/boakeity/src/view/biobankui.xhtml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- biobankui.xhtml 14 Jan 2007 21:39:57 -0000 1.5 +++ biobankui.xhtml 16 Jan 2007 23:32:23 -0000 1.6 @@ -78,7 +78,9 @@ </div> <div> <h:outputLabel for="biobankType" class="heading" value="#{msg.BiobankType}"/> - <h:inputText id="biobankType" value="#{biobank.biobankType}" style="width: 175px;"/> + <h:selectOneMenu id="biobankType" value="#{biobank.biobankType}"> + <f:selectItems value="#{biobankTypeList}" /> + </h:selectOneMenu> </div> <div> <h:outputLabel for="country" class="heading" value="#{msg.BiobankCountry}"/> |
|
From: Johan T. <jt...@us...> - 2007-01-16 23:32:28
|
Update of /cvsroot/boakeity/boakeity/i18n In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9054/i18n Modified Files: messages_en.properties messages_sv.properties Log Message: Add facility for choosing biobank type. Index: messages_en.properties =================================================================== RCS file: /cvsroot/boakeity/boakeity/i18n/messages_en.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- messages_en.properties 27 Nov 2006 14:51:25 -0000 1.7 +++ messages_en.properties 16 Jan 2007 23:32:23 -0000 1.8 @@ -41,6 +41,7 @@ AddressZipcode = Address - zipcode AddressCity = Address - city BiobankType = Biobank type +BiobankTypeList = ;Choose a type|TYP1;Biobank at department for pathology/cytology|TYP2;Biobank at department for clinical chemistry|TYP3;Biobank at department for gynecology/obstetrics|TYP4;Biobank that contains material for IVF and similiar activity|TYP5;Biobank at department for bacteriology/virology|TYP6;Biobank that contains material for transfusion|TYP7;Biobank that contains material for transplantation purposes|TYP8;Other biobank|TYP9;Combination of biobanks BiobankCountry = Biobank country EstablishDate = Establish date BiobankResponsible = Biobank responsible Index: messages_sv.properties =================================================================== RCS file: /cvsroot/boakeity/boakeity/i18n/messages_sv.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- messages_sv.properties 27 Nov 2006 14:51:25 -0000 1.7 +++ messages_sv.properties 16 Jan 2007 23:32:23 -0000 1.8 @@ -41,6 +41,7 @@ AddressZipcode = Postnummer AddressCity = Postort BiobankType = Biobankstyp +BiobankTypeList = ;Välj en typ|TYP1;Biobank vid avdelning för patologi/cytologi|TYP2;Biobank vid avdelning för klinisk kemi|TYP3;Biobank vid avdelning för gynekologi/obstetrik|TYP4;Biobank som innehåller material för IVF och liknande verksamhet|TYP5;Biobank vid avdelning för bakteriologi/virologi|TYP6;Biobank som innehåller material för transfusion|TYP7;Biobank som innehåller material för transplantationsändamål|TYP8;Annan biobank|TYP9;Kombination av biobanker BiobankCountry = Biobanksland EstablishDate = Inrättandedatum BiobankResponsible = Biobanksansvarig |
|
From: Johan T. <jt...@us...> - 2007-01-16 23:31:46
|
Update of /cvsroot/boakeity/boakeity In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8659 Modified Files: build.xml Log Message: Add jsf-facelet.jar to war-file (for now). Index: build.xml =================================================================== RCS file: /cvsroot/boakeity/boakeity/build.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- build.xml 16 Jan 2007 22:53:13 -0000 1.11 +++ build.xml 16 Jan 2007 23:31:45 -0000 1.12 @@ -155,6 +155,9 @@ <include name="jboss-seam-debug.jar" /> <include name="jboss-seam-ui.jar" /> </zipfileset> + <zipfileset dir="external/lib/facelets" prefix="WEB-INF/lib/"> + <include name="jsf-facelets.jar" /> + </zipfileset> <zipfileset dir="i18n" prefix="WEB-INF/classes/"> <include name="*.properties" /> </zipfileset> |
|
From: Johan T. <jt...@us...> - 2007-01-16 22:53:15
|
Update of /cvsroot/boakeity/boakeity/src/resources/ear/META-INF In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24790/src/resources/ear/META-INF Modified Files: application.xml Log Message: Upgrade to JBoss Seam 1.1GA. Index: application.xml =================================================================== RCS file: /cvsroot/boakeity/boakeity/src/resources/ear/META-INF/application.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- application.xml 2 Nov 2006 14:51:10 -0000 1.2 +++ application.xml 16 Jan 2007 22:53:12 -0000 1.3 @@ -51,4 +51,10 @@ <module> <java>jboss-seam.jar</java> </module> + <module> + <java>el-ri.jar</java> + </module> + <module> + <java>el-api.jar</java> + </module> </application> |
|
From: Johan T. <jt...@us...> - 2007-01-16 22:53:15
|
Update of /cvsroot/boakeity/boakeity/external/lib In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24790/external/lib Modified Files: jboss-seam-debug.jar jboss-seam-ui.jar jboss-seam.jar Log Message: Upgrade to JBoss Seam 1.1GA. Index: jboss-seam-ui.jar =================================================================== RCS file: /cvsroot/boakeity/boakeity/external/lib/jboss-seam-ui.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsRrsKjM and /tmp/cvsX9VpAZ differ Index: jboss-seam-debug.jar =================================================================== RCS file: /cvsroot/boakeity/boakeity/external/lib/jboss-seam-debug.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsNe7oJQ and /tmp/cvsnkU4b4 differ Index: jboss-seam.jar =================================================================== RCS file: /cvsroot/boakeity/boakeity/external/lib/jboss-seam.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsE3W9OV and /tmp/cvsUhmct9 differ |
|
From: Johan T. <jt...@us...> - 2007-01-16 22:53:15
|
Update of /cvsroot/boakeity/boakeity In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24790 Modified Files: build.xml Log Message: Upgrade to JBoss Seam 1.1GA. Index: build.xml =================================================================== RCS file: /cvsroot/boakeity/boakeity/build.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- build.xml 15 Jan 2007 22:17:21 -0000 1.10 +++ build.xml 16 Jan 2007 22:53:13 -0000 1.11 @@ -151,9 +151,6 @@ <zipfileset dir="${src.resources}/web/"> <include name="**/*"/> </zipfileset> - <zipfileset dir="external/lib/facelets" prefix="WEB-INF/lib/"> - <include name="*.jar" /> - </zipfileset> <zipfileset dir="external/lib/" prefix="WEB-INF/lib/"> <include name="jboss-seam-debug.jar" /> <include name="jboss-seam-ui.jar" /> |
|
From: Johan T. <jt...@us...> - 2007-01-15 22:17:23
|
Update of /cvsroot/boakeity/boakeity In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15195 Modified Files: build.xml Log Message: Divide the target 'ejbjar' into one subtarget for each generated file, put the rest into 'build-ear'. Index: build.xml =================================================================== RCS file: /cvsroot/boakeity/boakeity/build.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- build.xml 10 Dec 2006 22:27:53 -0000 1.9 +++ build.xml 15 Jan 2007 22:17:21 -0000 1.10 @@ -29,7 +29,7 @@ <!-- Boakeity build file --> <!-- ======================================================================= --> -<project name="Boakeity" default="ejbjar" basedir="."> +<project name="Boakeity" default="build-ear" basedir="."> <property environment="env"/> <property name="src.dir" value="${basedir}/src/"/> @@ -90,8 +90,8 @@ <!-- =================================================================== --> - <target name="ejbjar" depends="compile" description="Builds the individual jar-files."> - <jar jarfile="${build.dir}/boakeity-session.jar"> + <target name="build-session" depends="compile" description="Builds the session jar-file"> + <jar jarfile="${build.dir}/boakeity-session.jar"> <manifest> <attribute name="Built-By" value="${user.name}" /> <attribute name="Specification-Title" value="Boakeity session beans" /> @@ -113,7 +113,11 @@ <include name="se/biobanksregistersyd/boakeity/importData/*.class"/> </fileset> </jar> + </target> + <!-- =================================================================== --> + + <target name="build-entity" depends="compile" description="Builds the entity jar-file"> <jar jarfile="${build.dir}/boakeity-entity.jar"> <fileset dir="${build.classes.dir}"> <include name="se/biobanksregistersyd/boakeity/entity/*.class"/> @@ -122,7 +126,11 @@ <include name="**/*"/> </fileset> </jar> + </target> + + <!-- =================================================================== --> + <target name="build-secureentity" depends="compile" description="Builds the secure entity jar-file"> <jar jarfile="${build.dir}/boakeity-secureentity.jar"> <fileset dir="${build.classes.dir}"> <include name="se/biobanksregistersyd/boakeity/secureEntity/*.class"/> @@ -131,7 +139,11 @@ <include name="**/*"/> </fileset> </jar> + </target> + + <!-- =================================================================== --> + <target name="build-web" depends="compile" description="Builds the web war-file"> <jar jarfile="${build.dir}/boakeity-web.war"> <zipfileset dir="src/view"> <include name="**/*"/> @@ -150,7 +162,11 @@ <include name="*.properties" /> </zipfileset> </jar> + </target> + <!-- =================================================================== --> + + <target name="build-action" depends="compile" description="Builds the action jar-file"> <jar jarfile="${build.dir}/boakeity-action.jar"> <fileset dir="${build.classes.dir}"> <include name="se/biobanksregistersyd/boakeity/action/*.class"/> @@ -159,12 +175,11 @@ <include name="**/*"/> </fileset> </jar> - </target> <!-- =================================================================== --> - <target name="build-ear" depends="ejbjar" description="Build boakeity.ear"> + <target name="build-ear" depends="build-session, build-entity, build-secureentity, build-web, build-action" description="Build boakeity.ear"> <jar destfile="${build.dir}/boakeity.ear"> <manifest> <attribute name="Built-By" value="${user.name}" /> |
|
From: Johan T. <jt...@us...> - 2007-01-15 21:23:13
|
Update of /cvsroot/boakeity/boakeity/src/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13472/src/view Modified Files: biobankui.xhtml Log Message: Apply a converter on the field 'establishDate' since it's a date. Index: biobankui.xhtml =================================================================== RCS file: /cvsroot/boakeity/boakeity/src/view/biobankui.xhtml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- biobankui.xhtml 20 Nov 2006 12:49:41 -0000 1.4 +++ biobankui.xhtml 14 Jan 2007 21:39:57 -0000 1.5 @@ -86,7 +86,10 @@ </div> <div> <h:outputLabel for="establishDate" class="heading" value="#{msg.EstablishDate}"/> - <h:inputText id="establishDate" value="#{biobank.establishDate}" style="width: 175px;"/> + <h:inputText id="establishDate" value="#{biobank.establishDate}" style="width: 175px;"> + <f:convertDateTime pattern="yyyy-MM-dd"/> + </h:inputText> + <div class="errors"><h:message for="establishDate"/></div> </div> <div> <h:outputLabel for="biobankResponsibleName" class="heading" value="#{msg.BiobankResponsible}"/> |
|
From: Johan T. <jt...@us...> - 2007-01-14 22:03:18
|
Update of /cvsroot/boakeity/boakeity In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23603 Modified Files: .project Log Message: Correct name of project. Index: .project =================================================================== RCS file: /cvsroot/boakeity/boakeity/.project,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .project 20 Sep 2006 10:04:34 -0000 1.1 +++ .project 14 Jan 2007 22:03:08 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>Boakeity2</name> + <name>boakeity</name> <comment></comment> <projects> </projects> |
|
From: Johan T. <jt...@us...> - 2007-01-14 20:19:57
|
Update of /cvsroot/boakeity/boakeity/src/se/biobanksregistersyd/boakeity/entity In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14279/src/se/biobanksregistersyd/boakeity/entity Modified Files: Biobank.java Log Message: The field 'establishDate' should only store timestamps with a granularity of dates, that is, no time information. Index: Biobank.java =================================================================== RCS file: /cvsroot/boakeity/boakeity/src/se/biobanksregistersyd/boakeity/entity/Biobank.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Biobank.java 13 Nov 2006 09:34:35 -0000 1.3 +++ Biobank.java 14 Jan 2007 20:19:49 -0000 1.4 @@ -33,6 +33,8 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToMany; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; import org.jboss.seam.annotations.Name; @@ -316,6 +318,7 @@ * was established. * @see #setEstablishDate(String) */ + @Temporal(TemporalType.DATE) public Date getEstablishDate() { return establishDate; } |
