String nom
BaseEleve baseEleve
Boolean isEliotOpen
+ Boolean isCdtOpen
static belongsTo = [baseEleve:BaseEleve]
return "BackofficeConfig{uai=$uai}"
}
-// boolean equals(o) {
-// if (this.is(o)) {return true}
-//
-// if (getClass() != o.class) {return false}
-//
-// BackofficeConfig that = (BackofficeConfig) o;
-//
-// if (uai != that.uai) {return false}
-// if (baseEleve != that.baseEleve) {return false}
-// if (lvs != that.lvs) {return false}
-// if (udt != that.udt) {return false}
-// if (nombreEleve != that.nombreEleve) {return false}
-// if (nom != that.nom) {return false}
-//
-// return true;
-// }
-
-
}
--- /dev/null
+<!--
+ ~ Copyright © FYLAB and the Conseil Régional d'Île-de-France, 2009
+ ~ This file is part of L'Interface Libre et Interactive de l'Enseignement (Lilie).
+ ~
+ ~ Lilie is free software. You can redistribute it and/or modify since
+ ~ you respect the terms of either (at least one of the both license) :
+ ~ - 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.
+ ~ - the CeCILL-C as published by CeCILL-C; either version 1 of the
+ ~ License, or any later version
+ ~
+ ~ There are special exceptions to the terms and conditions of the
+ ~ licenses as they are applied to this software. View the full text of
+ ~ the exception in file LICENSE.txt in the directory of this software
+ ~ distribution.
+ ~
+ ~ Lilie 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
+ ~ Licenses for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License
+ ~ and the CeCILL-C along with Lilie. If not, see :
+ ~ <http://www.gnu.org/licenses/> and
+ ~ <http://www.cecill.info/licences.fr.html>.
+ -->
+
+<databaseChangeLog
+ xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd">
+
+
+ <changeSet id="1" author="obon">
+ <comment>
+ Ajout de la colonne 'is_cdt_open' dans la table backoffice.backoffice_config
+ </comment>
+
+ <addColumn schemaName="backoffice" tableName="backoffice_config">
+ <column name="is_cdt_open" defaultValue="false" type="boolean">
+ <constraints nullable="false"/>
+ </column>
+ </addColumn>
+
+ </changeSet>
+
+</databaseChangeLog>
<include file="changelogs/scolarite/2013-10-22-0030580.xml"/>
<include file="changelogs/securite/2013-10-21-0030286.xml"/>
<include file="changelogs/scolarite/2013-11-06-0031676.xml"/>
+ <include file="changelogs/scolarite/2013-11-07-0031849.xml"/>
</databaseChangeLog>
Boolean isEliotOpen
Boolean isEliotOpenExists = false
+ Boolean isCdtOpen
+ Boolean isCdtOpenExists = false
def BackofficeConfigSaveParam() {
}
}
}
+ if(json.has('isCdtOpen')){
+ isCdtOpenExists = true
+ if(json.isCdtOpen == true || json.isCdtOpen == false){
+ isCdtOpen = json.isCdtOpen
+ }
+ }
+
}
static constraints = {
if (params?.uai) {filtre.uai = params.uai}
if (params?.isEtabEliot != null) {filtre.isEtabEliot = Boolean.valueOf(params.isEtabEliot)}
if (params?.isEliotOpen != null) {filtre.isEliotOpen = Boolean.valueOf(params.isEliotOpen)}
+ if (params?.isCdtOpen != null) {filtre.isCdtOpen = Boolean.valueOf(params.isCdtOpen)}
if (params?.baseEleve) {filtre.baseEleve = params.baseEleve}
if (params?.lvs != null) {filtre.lvs = Boolean.valueOf(params.lvs)}
if (params?.udt != null) {filtre.udt = Boolean.valueOf(params.udt)}
lvs: backofficeConfigSaveParam.lvs,
udt: backofficeConfigSaveParam.udt,
nombreEleve: backofficeConfigSaveParam.nombreEleve,
- isEliotOpen: backofficeConfigSaveParam.isEliotOpen
+ isEliotOpen: backofficeConfigSaveParam.isEliotOpen,
+ isCdtOpen: backofficeConfigSaveParam.isCdtOpen
).save(failOnError: true, flush: true)
}
(backofficeConfigSaveParam.lvsExists ? configBackofficeExistant.lvs != backofficeConfigSaveParam.lvs : false) ||
(backofficeConfigSaveParam.udtExists ? configBackofficeExistant.udt != backofficeConfigSaveParam.udt : false) ||
(backofficeConfigSaveParam.nombreEleveExists ? configBackofficeExistant.nombreEleve != backofficeConfigSaveParam.nombreEleve : false) ||
- (backofficeConfigSaveParam.isEliotOpenExists ? configBackofficeExistant.isEliotOpen != backofficeConfigSaveParam.isEliotOpen : false)
+ (backofficeConfigSaveParam.isEliotOpenExists ? configBackofficeExistant.isEliotOpen != backofficeConfigSaveParam.isEliotOpen : false) ||
+ (backofficeConfigSaveParam.isCdtOpenExists ? configBackofficeExistant.isCdtOpen != backofficeConfigSaveParam.isCdtOpen : false)
if (!different) {
return
configBackofficeExistant.udt = backofficeConfigSaveParam.udtExists ? backofficeConfigSaveParam.udt : configBackofficeExistant.udt
configBackofficeExistant.nombreEleve = backofficeConfigSaveParam.nombreEleveExists ? backofficeConfigSaveParam.nombreEleve : configBackofficeExistant.nombreEleve
configBackofficeExistant.isEliotOpen = backofficeConfigSaveParam.isEliotOpenExists ? backofficeConfigSaveParam.isEliotOpen : configBackofficeExistant.isEliotOpen
+ configBackofficeExistant.isCdtOpen = backofficeConfigSaveParam.isCdtOpenExists ? backofficeConfigSaveParam.isCdtOpen : configBackofficeExistant.isCdtOpen
configBackofficeExistant.save(flush:true, failOnError:true)
}
bc.udt,
bc.lvs,
bc.is_eliot_open,
+ bc.is_cdt_open,
etablissement.is_eliot as is_etab_eliot,
be.code as base_eleve,
dernier_import_udt_dates.date_debut_pre_traitement as debut_dernier_import_udt,
requeteSql <<= " and bc.is_eliot_open = ?"
params << filtre.isEliotOpen
}
+ if (filtre.isCdtOpen != null){
+ requeteSql <<= " and bc.is_cdt_open = ?"
+ params << filtre.isCdtOpen
+ }
if (filtre.baseEleve){
requeteSql <<= " and be.code = ?"
params << filtre.baseEleve
mapImport.udt = row.getProperty('udt')
mapImport.lvs = row.getProperty('lvs')
mapImport.isEliotOpen = row.getProperty('is_eliot_open')
+ mapImport.isCdtOpen = row.getProperty('is_cdt_open')
mapImport.isEtabEliot = row.getProperty('is_etab_eliot') ? true : false
mapImport.baseEleve = row.getProperty('base_eleve')
mapImport.debutDernierImportUdt = row.getProperty('debut_dernier_import_udt')
hql += """ AND bo.isEliotOpen = :isEliotOpen """
params["isEliotOpen"]=filtre.isEliotOpen
}
+ if (filtre?.isCdtOpen != null){
+ hql += """ AND bo.isCdtOpen = :isCdtOpen """
+ params["isCdtOpen"]=filtre.isCdtOpen
+ }
if (filtre?.baseEleve){
hql += " AND bo.baseEleve.code = :baseEleve"
params["baseEleve"]=filtre.baseEleve