Index: main/plugin-odf/plugin.xml
===================================================================
--- main/plugin-odf/plugin.xml (revision 27027)
+++ main/plugin-odf/plugin.xml (working copy)
@@ -2112,6 +2112,15 @@
<label i18n="true">PLUGINS_ODF_UITOOL_PROGRAM_NAME</label>
<test-operator>wd</test-operator>
</criteria>
+ <criteria name="campaign" type="string" column="1">
+ <label i18n="true">PLUGINS_ODF_UITOOL_PROGRAM_CAMPAIGN</label>
+ <test-operator>eq</test-operator>
+ <enumeration>
+ <custom-enumerator class="org.ametys.odf.enumeration.CampaignEnumerator">
+ <all-option>blank</all-option>
+ </custom-enumerator>
+ </enumeration>
+ </criteria>
<criteria name="workflow-step" type="string" column="1" metadata="false">
<label i18n="true">PLUGINS_ODF_UITOOL_SEARCH_CONTENT_WORKFLOW_STEP</label>
<test-operator>eq</test-operator>
@@ -2178,6 +2187,7 @@
<property id="title" path="metadata/title"/>
<property id="orgUnit" path="metadata/orgUnit"/>
<property id="code" path="metadata/code"/>
+ <property id="campaign" path="metadata/campaign"/>
<property id="contributor" path="metadata/contributor"/>
<property id="icon-small" path="@smallIcon"/>
<property id="icon-medium" path="@mediumIcon"/>
@@ -2190,7 +2200,7 @@
<columns>
<column id="title" hideable="false">
<label i18n="true">PLUGINS_ODF_UITOOL_PROGRAM_NAME</label>
- <width>350</width>
+ <width>270</width>
<renderer>org.ametys.cms.tool.search.SearchTool.renderTitle</renderer>
</column>
<column id="language">
@@ -2202,6 +2212,10 @@
<label i18n="true">PLUGINS_ODF_UITOOL_PROGRAM_DIPCODE</label>
<width>100</width>
</column>
+ <column id="campaign">
+ <label i18n="true">PLUGINS_ODF_UITOOL_PROGRAM_CAMPAIGN</label>
+ <width>150</width>
+ </column>
<column id="orgUnit">
<label i18n="true">PLUGINS_ODF_UITOOL_PROGRAM_ORGUNIT</label>
<width>150</width>
@@ -3237,10 +3251,25 @@
</cms:metadata>
</cms:repeater>
+ <!-- // HABILITATION -->
+ <cms:metadata name="campaign" type="string">
+ <label i18n="true">PLUGINS_ODF_PROGRAM_CAMPAIGN</label>
+ <description i18n="true">PLUGINS_ODF_PROGRAM_CAMPAIGN_DESC</description>
+ <widget>sorted-enumeration</widget>
+ <enumeration>
+ <custom-enumerator class="org.ametys.odf.enumeration.CampaignEnumerator"/>
+ </enumeration>
+ <validation>
+ <mandatory/>
+ </validation>
+ </cms:metadata>
+ <!-- // Fin HABILITATION -->
+
<cms:dublin-core/>
<cms:metadata-set name="main" type="view">
<cms:metadata-ref name="title" />
+ <cms:metadata-ref name="campaign" />
<cms:metadata-ref name="code" />
<cms:metadata-ref name="cdmCode" />
<cms:metadata-ref name="presentation"/>
@@ -3312,6 +3341,7 @@
<cms:metadata-set name="main" type="edition">
<cms:metadata-ref name="title" />
+ <cms:metadata-ref name="campaign" />
<cms:fieldset>
<cms:label i18n="true">PLUGINS_ODF_PROGRAM_PRESENTATION_FIELDSET</cms:label> <!-- Presentation -->
<cms:metadata-ref name="degree" />
@@ -3416,6 +3446,7 @@
<cms:metadata-ref name="title" />
<cms:metadata-ref name="keywords" />
<cms:metadata-ref name="domain" />
+ <cms:metadata-ref name="campaign" />
<cms:metadata-ref name="educationKind" />
<cms:metadata-ref name="degree" />
<cms:metadata-ref name="dgesipCode"/>
Index: main/plugin-odf/src/org/ametys/odf/program/AbstractProgram.java
===================================================================
--- main/plugin-odf/src/org/ametys/odf/program/AbstractProgram.java (revision 27027)
+++ main/plugin-odf/src/org/ametys/odf/program/AbstractProgram.java (working copy)
@@ -232,6 +232,9 @@
/** Constants for metadata 'keywords' */
public static final String KEYWORDS = "keywords";
+ /** Constants for metadata 'campaign' */
+ public static final String CAMPAIGN = "campaign";
+
/**
* References
*/
@@ -1336,6 +1339,25 @@
getMetadataHolder().setMetadata(KEYWORDS, keywords);
}
+ /**
+ * Get the campaign of this {@link Program}
+ * @return the campaign or null if not set
+ */
+ public String getCampaign()
+ {
+ return getString(CAMPAIGN);
+ }
+
+ /**
+ * Set the campaign
+ * @param campaign the campaign to set
+ * @throws AmetysRepositoryException if an error occurred
+ */
+ public void setCampaign(String campaign) throws AmetysRepositoryException
+ {
+ getMetadataHolder().setMetadata(CAMPAIGN, campaign);
+ }
+
// --------------------------------------------------------------------------------------//
// CDM-fr
// --------------------------------------------------------------------------------------//
Index: main/plugin-odf/src/org/ametys/odf/enumeration/CampaignEnumerator.java
===================================================================
--- main/plugin-odf/src/org/ametys/odf/enumeration/CampaignEnumerator.java (revision 0)
+++ main/plugin-odf/src/org/ametys/odf/enumeration/CampaignEnumerator.java (revision 0)
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014 Anyware Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.ametys.odf.enumeration;
+
+import org.ametys.runtime.util.parameter.Enumerator;
+
+/**
+ * {@link Enumerator} for the ODF "sectors activity" enumeration
+ */
+public class CampaignEnumerator extends AbstractODFEnumerator
+{
+ @Override
+ protected String getEnumerationName()
+ {
+ return OdfEnumerationConstant.CAMPAIGN;
+ }
+}
Index: main/plugin-odf/src/org/ametys/odf/enumeration/OdfEnumerationConstant.java
===================================================================
--- main/plugin-odf/src/org/ametys/odf/enumeration/OdfEnumerationConstant.java (revision 27027)
+++ main/plugin-odf/src/org/ametys/odf/enumeration/OdfEnumerationConstant.java (working copy)
@@ -59,4 +59,6 @@
public static final String CODE_FAP = "CODE_FAP";
/** Code FAP */
public static final String JOIN_ORGUNIT = "JOIN_ORGUNIT";
+ /** Campagne */
+ public static final String CAMPAIGN = "CAMPAIGN";
}
Index: main/plugin-odf/i18n/messages_en.xml
===================================================================
--- main/plugin-odf/i18n/messages_en.xml (revision 27027)
+++ main/plugin-odf/i18n/messages_en.xml (working copy)
@@ -653,6 +653,8 @@
<message key="PLUGINS_ODF_PROGRAM_ATTACHED_FILE_TEXT">Text to display</message>
<message key="PLUGINS_ODF_PROGRAM_ATTACHED_FILE_TEXT_DESC">Text to display in place of the filename for download link.<br/>If empty the filename will be used.</message>
<message key="PLUGINS_ODF_PROGRAM_PDF_DOWNLOAD_ALT">Download to PDF</message>
+ <message key="PLUGINS_ODF_PROGRAM_CAMPAIGN">Campaign</message>
+ <message key="PLUGINS_ODF_PROGRAM_CAMPAIGN_DESC">Program habilitation campaign</message>
<!-- Type Content : subprogram -->
<message key="PLUGINS_ODF_SUBPROGRAM_CONTENT_LABEL">Subprogram</message>
@@ -844,6 +846,7 @@
+ -->
<message key="PLUGINS_ODF_UITOOL_PROGRAM_NAME">Name</message>
<message key="PLUGINS_ODF_UITOOL_PROGRAM_DIPCODE">Code</message>
+ <message key="PLUGINS_ODF_UITOOL_PROGRAM_CAMPAIGN">Campaign</message>
<message key="PLUGINS_ODF_UITOOL_PROGRAM_LANG">Language</message>
<message key="PLUGINS_ODF_UITOOL_PROGRAM_TITLE">Title</message>
<message key="PLUGINS_ODF_UITOOL_PROGRAM_ORGUNIT">Organizational unit(s)</message>
Index: main/plugin-odf/i18n/messages_fr.xml
===================================================================
--- main/plugin-odf/i18n/messages_fr.xml (revision 27027)
+++ main/plugin-odf/i18n/messages_fr.xml (working copy)
@@ -655,6 +655,8 @@
<message key="PLUGINS_ODF_PROGRAM_ATTACHED_FILE_TEXT">Texte à afficher</message>
<message key="PLUGINS_ODF_PROGRAM_ATTACHED_FILE_TEXT_DESC">Texte à afficher à la place du nom du fichier sur le lien de téléchargement.<br/>Si vide le nom du fichier sera utlisé.</message>
<message key="PLUGINS_ODF_PROGRAM_PDF_DOWNLOAD_ALT">Télécharger la fiche formation au format PDF</message>
+ <message key="PLUGINS_ODF_PROGRAM_CAMPAIGN">Campagne</message>
+ <message key="PLUGINS_ODF_PROGRAM_CAMPAIGN_DESC">Campagne d'habilitation de la formation</message>
<!-- Type Content : subprogram -->
<message key="PLUGINS_ODF_SUBPROGRAM_CONTENT_LABEL">Parcours</message>
@@ -846,6 +848,7 @@
+ -->
<message key="PLUGINS_ODF_UITOOL_PROGRAM_NAME">Libellé</message>
<message key="PLUGINS_ODF_UITOOL_PROGRAM_DIPCODE">Code diplôme</message>
+ <message key="PLUGINS_ODF_UITOOL_PROGRAM_CAMPAIGN">Campagne</message>
<message key="PLUGINS_ODF_UITOOL_PROGRAM_ORGUNIT">Composante(s)</message>
<message key="PLUGINS_ODF_UITOOL_PROGRAM_LANG">Langue</message>
<message key="PLUGINS_ODF_UITOOL_PROGRAM_TITLE">Listes des Formations</message>
Index: main/plugin-odf/doc/odf-enumeration.xml
===================================================================
--- main/plugin-odf/doc/odf-enumeration.xml (revision 27027)
+++ main/plugin-odf/doc/odf-enumeration.xml (working copy)
@@ -34,4 +34,5 @@
<item key="CODE_CITE97" location="context://WEB-INF/param/odf/code_cite97.xml"/>
<item key="CODE_FAP" location="context://WEB-INF/param/odf/code_fap.xml"/>
<item key="JOIN_ORGUNIT" location="context://WEB-INF/param/odf/join_orgunit.xml"/>
+ <item key="CAMPAIGN" location="context://WEB-INF/param/odf/campaign.xml"/>
</items>
\ No newline at end of file
Index: main/plugin-odf/doc/i18n/application_en.xml
===================================================================
--- main/plugin-odf/doc/i18n/application_en.xml (revision 27027)
+++ main/plugin-odf/doc/i18n/application_en.xml (working copy)
@@ -1786,4 +1786,8 @@
<message key="APPLICATION_ODF_COHABILITATION_0311383K">Université Toulouse 2 Le Mirail</message>
<message key="APPLICATION_ODF_COHABILITATION_0311384L">Université Toulouse 3 Paul Sabatier</message>
<message key="APPLICATION_ODF_COHABILITATION_9830001J">Vice-Rectorat de la Nouvelle-Calédonie</message>
+
+ <!-- CAMPAIGN -->
+ <message key="APPLICATION_ODF_HABILITATION_2009_2013">Campagne 2009-2013</message>
+ <message key="APPLICATION_ODF_HABILITATION_2013_2017">Campagne 2013-2017</message>
</catalogue>
\ No newline at end of file
Index: main/plugin-odf/doc/i18n/application.xml
===================================================================
--- main/plugin-odf/doc/i18n/application.xml (revision 27027)
+++ main/plugin-odf/doc/i18n/application.xml (working copy)
@@ -1786,4 +1786,8 @@
<message key="APPLICATION_ODF_COHABILITATION_0311383K">Université Toulouse 2 Le Mirail</message>
<message key="APPLICATION_ODF_COHABILITATION_0311384L">Université Toulouse 3 Paul Sabatier</message>
<message key="APPLICATION_ODF_COHABILITATION_9830001J">Vice-Rectorat de la Nouvelle-Calédonie</message>
+
+ <!-- CAMPAIGN -->
+ <message key="APPLICATION_ODF_HABILITATION_2009_2013">Campagne 2009-2013</message>
+ <message key="APPLICATION_ODF_HABILITATION_2013_2017">Campagne 2013-2017</message>
</catalogue>
\ No newline at end of file
Index: main/plugin-odf/doc/constants/campaign.xml
===================================================================
--- main/plugin-odf/doc/constants/campaign.xml (revision 0)
+++ main/plugin-odf/doc/constants/campaign.xml (revision 0)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2012 Anyware Services
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<items i18n-catalog="application">
+ <item code="2009-2013" i18n-key="APPLICATION_ODF_HABILITATION_2009_2013"/>
+ <item code="2013-2017" i18n-key="APPLICATION_ODF_HABILITATION_2013_2017"/>
+</items>
+