From b2cec62aa2eeb278fb5fa3a73fc07a3d7fef5047 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Wed, 11 Dec 2013 18:11:51 +0100
Subject: [PATCH] First version with model specific fields in
forecastconfiguration form Issue: validation of elements ( a bit shaky)
---
LICENSE.txt | 662 ++++++++++++++++++
nb-configuration.xml | 1 +
.../ForecastConfigurationController.java | 24 +-
.../controller/session/ForecastBean.java | 62 +-
.../logic/controller/session/UserBean.java | 1 -
.../model/AppleScabModelPreprocessor.java | 3 +-
.../model/ForecastModelConfiguration.java | 7 +-
.../model/ForecastModelConfigurationPK.java | 8 +-
.../vips/logic/service/LogicService.java | 11 +-
.../java/no/bioforsk/web/forms/FormField.java | 20 +
.../vips/logic/i18n/vipslogictexts.properties | 4 +
.../logic/i18n/vipslogictexts_no.properties | 4 +
src/main/webapp/css/vipslogic.css | 15 +
.../formdefinitions/models/APPLESCABM.json | 11 +
.../formdefinitions/models/NAERSTADMO.json | 17 +
.../webapp/js/forecastConfigurationForm.js | 204 ++++++
src/main/webapp/js/validateForm.js | 36 +-
.../templates/forecastConfigurationForm.ftl | 18 +-
18 files changed, 1078 insertions(+), 30 deletions(-)
create mode 100644 LICENSE.txt
create mode 100644 src/main/webapp/formdefinitions/models/APPLESCABM.json
create mode 100644 src/main/webapp/formdefinitions/models/NAERSTADMO.json
create mode 100644 src/main/webapp/js/forecastConfigurationForm.js
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 00000000..a871fcfd
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,662 @@
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU Affero General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Remote Network Interaction; Use with the GNU General Public License.
+
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
+
diff --git a/nb-configuration.xml b/nb-configuration.xml
index febfa410..bfe05d75 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -17,5 +17,6 @@ Any value defined here will override the pom.xml file value but is only applicab
<org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
<org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder>js</org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder>
<org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>JBoss4</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
+ <netbeans.hint.license>default_1</netbeans.hint.license>
</properties>
</project-shared-configuration>
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/ForecastConfigurationController.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/ForecastConfigurationController.java
index 4e31f707..d7b9b7dc 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/ForecastConfigurationController.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/ForecastConfigurationController.java
@@ -151,22 +151,24 @@ public class ForecastConfigurationController extends HttpServlet {
{
// Standard form validation
FormValidation formValidation = FormValidator.validateForm("forecastConfigurationForm",request,getServletContext());
- if(formValidation.isValid())
+ // Also validation the model specific fields
+ String modelId = formValidation.getFormField("modelId").getWebValue();
+ FormValidation modelFieldFormValidation = FormValidator.validateForm("models/" + modelId, request, getServletContext());
+
+ if(formValidation.isValid() && modelFieldFormValidation.isValid())
{
+ forecastBean.storeForecastConfiguration(forecastConfiguration, formValidation.getFormFields(), modelFieldFormValidation.getFormFields());
// Store form config
- forecastConfiguration.setModelId(formValidation.getFormField("modelId").getWebValue());
- PointOfInterest locationPoi = em.find(PointOfInterest.class, formValidation.getFormField("locationPointOfInterestId").getValueAsInteger());
- forecastConfiguration.setLocationPointOfInterestId(locationPoi);
- PointOfInterest weatherStationPoi = em.find(PointOfInterestWeatherStation.class, formValidation.getFormField("weatherStationPointOfInterestId").getValueAsInteger());
- forecastConfiguration.setWeatherStationPointOfInterestId(weatherStationPoi);
- forecastConfiguration.setDateStart(formValidation.getFormField("dateStart").getValueAsDate());
- forecastConfiguration.setDateEnd(formValidation.getFormField("dateEnd").getValueAsDate());
- VipsLogicUser forecastConfigurationUser = em.find(VipsLogicUser.class, formValidation.getFormField("vipsLogicUserId").getValueAsInteger());
- forecastConfiguration.setVipsCoreUserId(forecastConfigurationUser);
- forecastBean.storeForecastConfiguration(forecastConfiguration);
+
+
+ //forecastBean.storeForecastModelConfigurations(forecastConfiguration, modelFieldFormValidation.getFormFields());
+ // TODO: Store model specific fields
+ // First: Delete all o
+
request.setAttribute("messageKey", request.getParameter("formConfigurationUpdated"));
response.sendRedirect(new StringBuilder("http://").append(ServletUtil.getServerName(request)).append("/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=").append(forecastConfiguration.getForecastConfigurationId()).append("&messageKey=").append("forecastConfigurationUpdated").toString());
+
}
else
{
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/session/ForecastBean.java b/src/main/java/no/bioforsk/vips/logic/controller/session/ForecastBean.java
index 0aa541fb..f0c92e08 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/session/ForecastBean.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/session/ForecastBean.java
@@ -16,8 +16,12 @@ import no.bioforsk.vips.coremanager.service.ManagerResource;
import no.bioforsk.vips.logic.entity.ForecastResult;
import no.bioforsk.vips.logic.entity.ModelInformation;
import no.bioforsk.vips.logic.entity.Organization;
+import no.bioforsk.vips.logic.entity.PointOfInterest;
+import no.bioforsk.vips.logic.entity.PointOfInterestWeatherStation;
import no.bioforsk.vips.logic.entity.VipsLogicUser;
import no.bioforsk.vips.logic.scheduling.model.ForecastConfiguration;
+import no.bioforsk.vips.logic.scheduling.model.ForecastModelConfiguration;
+import no.bioforsk.web.forms.FormField;
import org.codehaus.jackson.JsonNode;
import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
@@ -32,7 +36,7 @@ public class ForecastBean {
EntityManager em;
/**
- * Returns all forecast results. TODO: put out of use!
+ * Returns all forecast results.
* @return
*/
public List<ForecastResult> getForecastResults()
@@ -139,9 +143,63 @@ public class ForecastBean {
return retVal;
}
- public void storeForecastConfiguration(ForecastConfiguration forecastConfiguration)
+ public void storeForecastConfiguration(ForecastConfiguration forecastConfiguration, Map<String, FormField> formFields, Map<String, FormField> modelSpecificFormFields)
{
+
+ forecastConfiguration.setModelId(formFields.get("modelId").getWebValue());
+ PointOfInterest locationPoi = em.find(PointOfInterest.class, formFields.get("locationPointOfInterestId").getValueAsInteger());
+ forecastConfiguration.setLocationPointOfInterestId(locationPoi);
+ PointOfInterest weatherStationPoi = em.find(PointOfInterestWeatherStation.class, formFields.get("weatherStationPointOfInterestId").getValueAsInteger());
+ forecastConfiguration.setWeatherStationPointOfInterestId(weatherStationPoi);
+ forecastConfiguration.setDateStart(formFields.get("dateStart").getValueAsDate());
+ forecastConfiguration.setDateEnd(formFields.get("dateEnd").getValueAsDate());
+ VipsLogicUser forecastConfigurationUser = em.find(VipsLogicUser.class, formFields.get("vipsLogicUserId").getValueAsInteger());
+ forecastConfiguration.setVipsCoreUserId(forecastConfigurationUser);
+
em.merge(forecastConfiguration);
+
+ // Reset all model configurations, then store the new ones
+ // As for now: We keep the old ones.
+ // Reason: If anybody screws up by changing a form, old configurations could get lost
+ /*List<ForecastModelConfiguration> configsToRemove = em.createNamedQuery("ForecastModelConfiguration.findByForecastConfigurationId").setParameter("forecastConfigurationId", forecastConfiguration.getForecastConfigurationId()).getResultList();
+ for(ForecastModelConfiguration configToRemove: configsToRemove)
+ {
+ em.remove(configToRemove);
+ }
+ em.flush();*/
+
+ // Store new values
+ for(FormField field : modelSpecificFormFields.values())
+ {
+ String deCamelizedFieldName = getDeCamelizedFieldName(forecastConfiguration.getModelId(), field.getName());
+ ForecastModelConfiguration forecastModelConfiguration = new ForecastModelConfiguration(forecastConfiguration.getForecastConfigurationId(), deCamelizedFieldName);
+ forecastModelConfiguration.setParameterValue(field.getWebValue());
+ em.merge(forecastModelConfiguration);
+ }
+
+ }
+
+ /**
+ *
+ * @param modelId
+ * @param camelCaseName
+ * @return MODELID_CAMEL_CASE_NAME
+ */
+ private String getDeCamelizedFieldName(String modelId, String camelCaseName)
+ {
+ StringBuilder deCamelizedFieldName = new StringBuilder(modelId.toUpperCase());
+ for(String phrase : camelCaseName.split("(?=\\p{Lu})"))
+ {
+ deCamelizedFieldName.append("_").append(phrase.toUpperCase());
+ }
+
+ return deCamelizedFieldName.toString();
+ }
+
+
+ public List<ForecastModelConfiguration> getForecastModelConfigurations(Long forecastConfigurationId)
+ {
+ return em.createNamedQuery("ForecastModelConfiguration.findByForecastConfigurationId").setParameter("forecastConfigurationId", forecastConfigurationId).getResultList();
}
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/session/UserBean.java b/src/main/java/no/bioforsk/vips/logic/controller/session/UserBean.java
index 1c9c2d7f..12932dbb 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/session/UserBean.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/session/UserBean.java
@@ -30,7 +30,6 @@ import no.bioforsk.vips.logic.entity.Organization;
import no.bioforsk.vips.logic.entity.UserAuthentication;
import no.bioforsk.vips.logic.entity.UserAuthenticationPK;
import no.bioforsk.vips.logic.entity.UserAuthenticationType;
-import no.bioforsk.vips.logic.entity.VipsLogicRole;
import no.bioforsk.vips.logic.entity.VipsLogicUser;
import no.bioforsk.vips.logic.i18n.SessionLocaleUtil;
import no.bioforsk.vips.logic.util.Globals;
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/model/AppleScabModelPreprocessor.java b/src/main/java/no/bioforsk/vips/logic/scheduling/model/AppleScabModelPreprocessor.java
index a52e2af0..8b2fe212 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/model/AppleScabModelPreprocessor.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/model/AppleScabModelPreprocessor.java
@@ -12,7 +12,8 @@ import no.bioforsk.vips.logic.entity.PointOfInterestWeatherStation;
import no.bioforsk.vips.logic.util.SystemTime;
/**
- * Gathers necessary data to run the Apple Scab Model (APPLESCABM)
+ * Gathers necessary data to run the Apple Scab Model (APPLESCABM).
+ * Also responsible for providing forecast configuration form with the correct input parameters
* @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
* @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/model/ForecastModelConfiguration.java b/src/main/java/no/bioforsk/vips/logic/scheduling/model/ForecastModelConfiguration.java
index f239936b..44b40255 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/model/ForecastModelConfiguration.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/model/ForecastModelConfiguration.java
@@ -10,6 +10,7 @@ import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
+import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
@@ -17,6 +18,7 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.validation.constraints.Size;
import javax.xml.bind.annotation.XmlRootElement;
+import org.codehaus.jackson.annotate.JsonIgnore;
/**
* @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
@@ -38,7 +40,7 @@ public class ForecastModelConfiguration implements Serializable {
@Column(name = "parameter_value")
private String parameterValue;
@JoinColumn(name = "forecast_configuration_id", referencedColumnName = "forecast_configuration_id", insertable = false, updatable = false)
- @ManyToOne(optional = false)
+ @ManyToOne(optional = false, fetch=FetchType.LAZY)
private ForecastConfiguration forecastConfiguration;
public ForecastModelConfiguration() {
@@ -48,7 +50,7 @@ public class ForecastModelConfiguration implements Serializable {
this.forecastModelConfigurationPK = forecastModelConfigurationPK;
}
- public ForecastModelConfiguration(int forecastConfigurationId, String modelConfigParameter) {
+ public ForecastModelConfiguration(long forecastConfigurationId, String modelConfigParameter) {
this.forecastModelConfigurationPK = new ForecastModelConfigurationPK(forecastConfigurationId, modelConfigParameter);
}
@@ -68,6 +70,7 @@ public class ForecastModelConfiguration implements Serializable {
this.parameterValue = parameterValue;
}
+ @JsonIgnore
public ForecastConfiguration getForecastConfiguration() {
return forecastConfiguration;
}
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/model/ForecastModelConfigurationPK.java b/src/main/java/no/bioforsk/vips/logic/scheduling/model/ForecastModelConfigurationPK.java
index 5b62d508..71ddd56d 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/model/ForecastModelConfigurationPK.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/model/ForecastModelConfigurationPK.java
@@ -16,7 +16,7 @@ public class ForecastModelConfigurationPK implements Serializable {
@Basic(optional = false)
@NotNull
@Column(name = "forecast_configuration_id")
- private int forecastConfigurationId;
+ private long forecastConfigurationId;
@Basic(optional = false)
@NotNull
@Size(min = 1, max = 255)
@@ -26,16 +26,16 @@ public class ForecastModelConfigurationPK implements Serializable {
public ForecastModelConfigurationPK() {
}
- public ForecastModelConfigurationPK(int forecastConfigurationId, String modelConfigParameter) {
+ public ForecastModelConfigurationPK(long forecastConfigurationId, String modelConfigParameter) {
this.forecastConfigurationId = forecastConfigurationId;
this.modelConfigParameter = modelConfigParameter;
}
- public int getForecastConfigurationId() {
+ public long getForecastConfigurationId() {
return forecastConfigurationId;
}
- public void setForecastConfigurationId(int forecastConfigurationId) {
+ public void setForecastConfigurationId(long forecastConfigurationId) {
this.forecastConfigurationId = forecastConfigurationId;
}
diff --git a/src/main/java/no/bioforsk/vips/logic/service/LogicService.java b/src/main/java/no/bioforsk/vips/logic/service/LogicService.java
index ecc1d70e..12f4ace7 100644
--- a/src/main/java/no/bioforsk/vips/logic/service/LogicService.java
+++ b/src/main/java/no/bioforsk/vips/logic/service/LogicService.java
@@ -18,8 +18,8 @@ import no.bioforsk.vips.logic.authenticate.PasswordValidationException;
import no.bioforsk.vips.logic.entity.ForecastResult;
import no.bioforsk.vips.logic.i18n.SessionLocaleUtil;
import no.bioforsk.vips.logic.scheduling.model.ForecastConfiguration;
+import no.bioforsk.vips.logic.scheduling.model.ForecastModelConfiguration;
import no.bioforsk.vips.logic.util.SessionControllerGetter;
-import no.bioforsk.vips.logic.util.Globals;
import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
import org.jboss.resteasy.spi.HttpRequest;
@@ -116,6 +116,15 @@ public class LogicService {
}
}
+ @GET
+ @Path("forecastmodelconfiguration/{forecastConfigurationId}")
+ @Produces("application/json;charset=UTF-8")
+ public Response getForecastModelConfiguration(@PathParam("forecastConfigurationId") Long forecastConfigurationId)
+ {
+ List<ForecastModelConfiguration> forecastModelConfigurations = SessionControllerGetter.getForecastBean().getForecastModelConfigurations(forecastConfigurationId);
+ return Response.ok().entity(forecastModelConfigurations).build();
+ }
+
private ManagerResource getManagerResource()
{
Client client = ClientBuilder.newClient();
diff --git a/src/main/java/no/bioforsk/web/forms/FormField.java b/src/main/java/no/bioforsk/web/forms/FormField.java
index 8a09c075..1db156e1 100644
--- a/src/main/java/no/bioforsk/web/forms/FormField.java
+++ b/src/main/java/no/bioforsk/web/forms/FormField.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ *
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
package no.bioforsk.web.forms;
import java.text.ParseException;
@@ -21,6 +40,7 @@ public class FormField {
public static String FORM_FIELD_TYPE_INTEGER = "INTEGER";
public static String FORM_FIELD_TYPE_DOUBLE = "DOUBLE";
public static String FORM_FIELD_TYPE_DATE = "DATE";
+ public static String FORM_FIELD_TYPE_TIMESTAMP = "TIMESTAMP";
public static String FORM_FIELD_TYPE_PASSWORD = "PASSWORD";
public static String FORM_FIELD_TYPE_EMAIL = "EMAIL";
public static String FORM_FIELD_TYPE_SELECT_SINGLE = "SELECT_SINGLE";
diff --git a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts.properties b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts.properties
index ba0447b8..febe8a73 100644
--- a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts.properties
+++ b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts.properties
@@ -89,3 +89,7 @@ locationPointOfInterestId=Location
weatherStationPointOfInterestId=Weather station
addNew=Add new
xIsNotAfterY={0} is not after {1}
+calculationStart=Calculation start
+calculationEnd=Calculation end
+startDateAscosporeMaturity=Start date for ascospore maturation
+specificFieldsForX=Specific fields for {0}
diff --git a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_no.properties b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_no.properties
index b6b50b10..ed110a08 100644
--- a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_no.properties
+++ b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_no.properties
@@ -89,3 +89,7 @@ locationPointOfInterestId=Lokalitet
weatherStationPointOfInterestId=M\u00e5lestasjon
addNew=Legg til ny
xIsNotAfterY={0} er ikke etter {1}
+calculationStart=Beregningsstart
+calculationEnd=Beregningsslutt
+startDateAscosporeMaturity=Startdato for askosporemodning
+specificFieldsForX=Spesifikke felt for {0}
diff --git a/src/main/webapp/css/vipslogic.css b/src/main/webapp/css/vipslogic.css
index ba6a4622..b12b72b0 100644
--- a/src/main/webapp/css/vipslogic.css
+++ b/src/main/webapp/css/vipslogic.css
@@ -11,3 +11,18 @@
padding-bottom: 6px;
}
+fieldset {
+ border: 1px solid #C0C0C0;
+ padding: 15px;
+ margin-bottom: 15px;
+}
+
+fieldset#modelSpecificFields{
+ display: none;
+}
+
+legend {
+ width: auto; /* Or auto */
+ padding: 0 10px; /* To give a bit of padding on the left and right */
+ border-bottom:none;
+}
\ No newline at end of file
diff --git a/src/main/webapp/formdefinitions/models/APPLESCABM.json b/src/main/webapp/formdefinitions/models/APPLESCABM.json
new file mode 100644
index 00000000..775a081f
--- /dev/null
+++ b/src/main/webapp/formdefinitions/models/APPLESCABM.json
@@ -0,0 +1,11 @@
+{
+ "_comment" : "Structure of the specific fields for APPLESCABM",
+ "fields": [
+ {
+ "name" : "startDateAscosporeMaturity",
+ "type" : "DATE",
+ "dateFormat" : "yyyy-MM-dd",
+ "required" : true
+ }
+ ]
+}
diff --git a/src/main/webapp/formdefinitions/models/NAERSTADMO.json b/src/main/webapp/formdefinitions/models/NAERSTADMO.json
new file mode 100644
index 00000000..f5732a66
--- /dev/null
+++ b/src/main/webapp/formdefinitions/models/NAERSTADMO.json
@@ -0,0 +1,17 @@
+{
+ "_comment" : "Structure of the specific fields for NAERSTADMO",
+ "fields": [
+ {
+ "name" : "calculationStart",
+ "type" : "TIMESTAMP",
+ "dateFormat" : "yyyy-MM-dd",
+ "required" : true
+ },
+ {
+ "name" : "calculationEnd",
+ "type" : "TIMESTAMP",
+ "dateFormat" : "yyyy-MM-dd",
+ "required" : true
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/main/webapp/js/forecastConfigurationForm.js b/src/main/webapp/js/forecastConfigurationForm.js
new file mode 100644
index 00000000..60f082c0
--- /dev/null
+++ b/src/main/webapp/js/forecastConfigurationForm.js
@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ *
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/*
+ * Helpers for the template forecastConfigurationForm.ftl.
+ * Depends on /js/validateForm.js
+ * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
+ * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ *
+ */
+
+/**
+ * Responsible for rendering the model specific fields
+ * @returns {void}
+ */
+function renderModelSpecificFields()
+{
+ // Get the model Id
+ var modelIdEl = document.getElementById("modelId");
+ var modelId = modelIdEl.options[modelIdEl.options.selectedIndex].value;
+
+ // Get form definition if not already present
+ if(formDefinitions[modelId] === null || formDefinitions[modelId] === undefined)
+ {
+ // Get the fields (JSON format)
+ $.getJSON( "/formdefinitions/models/" + modelId + ".json")
+ .done(function(json){
+ formDefinitions[modelId] = json;
+ renderModelSpecificFieldsCallback(modelId);
+ });
+ }
+ else
+ {
+ renderModelSpecificFieldsCallback(modelId);
+ }
+}
+
+/**
+ *
+ * @param {type} modelId
+ * @returns {undefined}
+ */
+function renderModelSpecificFieldsCallback(modelId)
+{
+ var formDefinition = formDefinitions[modelId];
+ var fieldsHTML = ["<legend>" + getI18nMsg("specificFieldsForX", [getI18nMsg(modelId)])+ "</legend>"];
+ for(var i in formDefinition.fields){
+ var fieldDefinition = formDefinition.fields[i];
+ fieldsHTML.push(createFieldHTML(modelId, fieldDefinition));
+ }
+
+ var fieldSet = document.getElementById("modelSpecificFields");
+ fieldSet.innerHTML = fieldsHTML.join("\n");
+ fieldSet.style.display="block";
+
+ // Fetch any values if present
+ fetchModelSpecificFieldValues();
+}
+
+/**
+ * If this forecast configuration has existing model specific values: fetch them and attempt to display them
+ * If the values are for a different model than the currently selected one, they will not be displayed
+ *
+ * @returns {void}
+ */
+function fetchModelSpecificFieldValues()
+{
+ // Get forecast configuration id
+ var forecastConfigurationId = document.getElementById("forecastConfigurationId").value;
+ // Just checking...
+ if(forecastConfigurationId <= 0)
+ {
+ return;
+ }
+ $.getJSON( "/rest/forecastmodelconfiguration/" + forecastConfigurationId)
+ .done(function(json){
+ fetchModelSpecificFieldValuesCallback(json);
+ });
+
+}
+
+/**
+ *
+ * @param {JSON} fieldValues
+ * @returns {undefined}
+ */
+function fetchModelSpecificFieldValuesCallback(fieldValues)
+{
+ var theForm = getFormForField(document.getElementById("modelSpecificFields"));
+ for(var i in fieldValues){
+ // Parametername consists of [MODELID]_[FORM_FIELD_NAME_UNCAMELED]
+ // We convert it to formfield name
+ var fieldName = getFieldNameFromModelConfigParameter(fieldValues[i].forecastModelConfigurationPK.modelConfigParameter);
+ //console.log(fieldValues[i].forecastModelConfigurationPK.modelConfigParameter + ": " + fieldName);
+ if(theForm[fieldName] !== null && theForm[fieldName] !== undefined)
+ {
+ theForm[fieldName].value=fieldValues[i].parameterValue;
+ }
+ }
+}
+
+/**
+ * Parametername consists of [MODELID]_[FORM_FIELD_NAME_UNCAMELCASED]
+ * We convert it to formfield name (formFieldNameCamelCased)
+ * @param {type} modelConfigParameter
+ * @returns {undefined}
+ */
+function getFieldNameFromModelConfigParameter(modelConfigParameter)
+{
+ var fieldName = "";
+ var fieldNameParts = modelConfigParameter.split("_");
+ for(var i=1;i<fieldNameParts.length;i++)
+ {
+ // First letter in first part is lower case
+ // First letter in all consecutive parts are upper case
+ // All other letters are lower case
+ fieldName += (i === 1 ? fieldNameParts[i].charAt(0).toLowerCase() : fieldNameParts[i].charAt(0).toUpperCase())
+ + fieldNameParts[i].slice(1).toLowerCase();
+ }
+ return fieldName;
+}
+
+var FIELD_PREFIX = [
+ '<div class="form-group">',
+ '<label for="{0}">{1}</label>'
+ ].join("\n");
+
+var FIELD_SUFFIX = [
+ '<span class="help-block" id="forecastConfigurationForm_{0}_validation"></span>',
+ '</div>'
+ ].join("\n");
+
+function createFieldHTML(modelId, fieldDefinition)
+{
+ var fieldHTML = "";
+ if(fieldDefinition.type !== formFieldTypes.TYPE_SELECT_SINGLE || fieldDefinition.type !== formFieldTypes.TYPE_SELECT_MULTIPLE)
+ {
+ var inputType = getHTMLInputType(fieldDefinition.type);
+ fieldHTML = '<input type="' + inputType + '" class="form-control" name="' + fieldDefinition.name + '" placeholder="' + getI18nMsg(fieldDefinition.name) + '" onblur="validateField(this,\'' + modelId + '\');" />';
+ }
+
+ return [
+ replaceParams(FIELD_PREFIX,[fieldDefinition.name, getI18nMsg(fieldDefinition.name)]),
+ fieldHTML,
+ replaceParams(FIELD_SUFFIX,[fieldDefinition.name])
+ ].join("\n");
+}
+
+/**
+ * Mapping between field type in VIPSLogic and HTML input type
+ * @param {String} fieldType
+ * @returns {String}
+ */
+function getHTMLInputType(fieldType)
+{
+ switch(fieldType)
+ {
+ case formFieldTypes.TYPE_STRING:
+ return "text";
+ break;
+ case formFieldTypes.TYPE_INTEGER:
+ return "number";
+ break;
+ case formFieldTypes.TYPE_DOUBLE:
+ return "number";
+ break;
+ case formFieldTypes.TYPE_DATE:
+ return "date";
+ break;
+ case formFieldTypes.TYPE_TIMESTAMP:
+ return "datetime";
+ break;
+ case formFieldTypes.TYPE_PASSWORD:
+ return "password";
+ break;
+ case formFieldTypes.TYPE_EMAIL:
+ return "email";
+ break;
+ default:
+ return "text";
+ }
+}
+
+
+
+
+
+
diff --git a/src/main/webapp/js/validateForm.js b/src/main/webapp/js/validateForm.js
index a8d4a64e..3c07cecf 100644
--- a/src/main/webapp/js/validateForm.js
+++ b/src/main/webapp/js/validateForm.js
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ *
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
/*
* This validator has its Java counterpart in no.bioforsk.web.forms.FormValidator.java
* (for server side validation). They use the same JSON file for form validation.
@@ -10,6 +29,7 @@ var formFieldTypes = {
TYPE_INTEGER: "INTEGER",
TYPE_DOUBLE: "DOUBLE",
TYPE_DATE: "DATE",
+ TYPE_TIMESTAMP: "TIMESTAMP",
TYPE_PASSWORD: "PASSWORD",
TYPE_EMAIL: "EMAIL",
TYPE_SELECT_SINGLE: "SELECT_SINGLE",
@@ -99,7 +119,7 @@ function validateFormActual(theForm)
}
// String equality NOW!
- console.log("relationTYpe=" + item.relationType);
+ //console.log("relationTYpe=" + item.relationType);
if(item.relationType === relationTypes.RELATION_TYPE_EQUALS)
{
if(primaryFieldWebValue !== secondaryFieldWebValue)
@@ -136,12 +156,16 @@ function validateFormActual(theForm)
* @param {DOMElement} fieldEl
* @returns {void}
*/
-function validateField(fieldEl)
+function validateField(fieldEl, formDefinitionKey)
{
// Which form does this element belong to?
var theForm = getFormForField(fieldEl);
+ if(formDefinitionKey === null || formDefinitionKey === undefined)
+ {
+ formDefinitionKey = theForm.id;
+ }
// If form definition is null, get it before we proceed
- if(formDefinitions[theForm.id] === undefined)
+ if(formDefinitions[formDefinitionKey] === undefined)
{
$.getJSON( "/formdefinitions/" + theForm.id + ".json")
.done(function(json){
@@ -151,7 +175,7 @@ function validateField(fieldEl)
}
else
{
- validateFieldActual(fieldEl, theForm);
+ validateFieldActual(fieldEl, theForm, formDefinitionKey);
}
}
@@ -190,10 +214,10 @@ function getValidationOutputEl(fieldEl, theForm)
* @param {Element} theForm the form
* @returns {void}
*/
-function validateFieldActual(fieldEl, theForm)
+function validateFieldActual(fieldEl, theForm, formDefinitionKey)
{
var webValue = fieldEl.value;
- var fieldDefinition = getFieldDefinition(fieldEl.name, formDefinitions[theForm.id]);
+ var fieldDefinition = getFieldDefinition(fieldEl.name, formDefinitions[formDefinitionKey !== null ? formDefinitionKey : theForm.id]);
// Empty?
if(webValue === null || webValue === "")
diff --git a/src/main/webapp/templates/forecastConfigurationForm.ftl b/src/main/webapp/templates/forecastConfigurationForm.ftl
index 81c0d8ea..6e7d6fb6 100644
--- a/src/main/webapp/templates/forecastConfigurationForm.ftl
+++ b/src/main/webapp/templates/forecastConfigurationForm.ftl
@@ -4,6 +4,7 @@
</#macro>
<#macro custom_js>
<script src="/js/resourcebundle.js"></script>
+ <script src="/js/forecastConfigurationForm.js"></script>
<script src="/js/validateForm.js"></script>
<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
<link href="http://code.jquery.com/ui/1.10.3/themes/redmond/jquery-ui.css" rel="stylesheet" />
@@ -15,6 +16,16 @@
if (!Modernizr.inputtypes.date) {
$('input[type=date]').datepicker({ dateFormat: 'yy-mm-dd' });
}
+ // Show specific fields for model
+ if(document.getElementById('modelId').options.selectedIndex > 0)
+ {
+ renderModelSpecificFields();
+ // Fetch values for fields if existing forecastConfiguration
+ if(document.getElementById('forecastConfigurationId').value !== "-1")
+ {
+ fetchModelSpecificFieldValues();
+ }
+ }
</script>
</#macro>
<#macro page_contents>
@@ -27,10 +38,10 @@
</#if>
<#assign formId = "forecastConfigurationForm">
<form id="${formId}" role="form" action="/forecastConfiguration?action=forecastConfigurationFormSubmit" method="POST" onsubmit="try{return validateForm(this);}catch(err){alert(err);return false;}">
- <input type="hidden" name="forecastConfigurationId" value="${forecastConfiguration.forecastConfigurationId!"-1"}"/>
+ <input type="hidden" id="forecastConfigurationId" name="forecastConfigurationId" value="${forecastConfiguration.forecastConfigurationId!"-1"}"/>
<div class="form-group">
<label for="modelId">${i18nBundle.modelId}</label>
- <select class="form-control" name="modelId" onblur="validateField(this);">
+ <select class="form-control" id="modelId" name="modelId" onblur="validateField(this);" onchange="renderModelSpecificFields();">
<option value="-1">${i18nBundle.pleaseSelect} ${i18nBundle.modelId?lower_case}</option>
<#list modelInformations as modelInformation>
<option value="${modelInformation.modelId}"<#if forecastConfiguration.modelId?has_content && modelInformation.modelId == forecastConfiguration.modelId> selected="selected"</#if>>
@@ -84,6 +95,9 @@
</select>
<span class="help-block" id="${formId}_vipsLogicUserId_validation"></span>
</div>
+ <fieldset id="modelSpecificFields">
+
+ </fieldset>
<button type="submit" class="btn btn-default">${i18nBundle.submit}</button>
<button type="button" class="btn btn-danger" onclick="if(confirm('${i18nBundle.confirmDelete}')){alert('Not implemented');}">${i18nBundle.delete}</button>
</form>
--
GitLab