Commit 8a13ced6 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

retrait des libs db-import et octopus

parent 18019c7a
Loading
Loading
Loading
Loading
+0 −2
Changes for composer.json: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -19,12 +19,10 @@
    "unicaen/parametre": "^5.0",
    "unicaen/bjy-authorize": "^4",
    "unicaen/ldap": "^4",
    "unicaen/octopus": "^4",
    "unicaen/evenement": "^5.0",
    "unicaen/autoform": "^5.0",
    "unicaen/aide": "dev-master",
    "ext-json": "*",
    "unicaen/db-import": "dev-utilisateur",
    "unicaen/indicateur": "^0.0"
  },
  "require-dev": {
+0 −4
Changes for config/application.config.php: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ $modules = [
    'DoctrineModule', 'DoctrineORMModule', 'ZfcUser', 'BjyAuthorize' => 'BjyAuthorize',
    'UnicaenApp',
    'UnicaenLdap',
//    'UnicaenLivelog',
    'UnicaenDbImport',
    'Octopus',

    'UnicaenPrivilege',
    'UnicaenAuthentification',
@@ -42,7 +39,6 @@ $modules = [
    'UnicaenValidation',
    'UnicaenEvenement',
    'UnicaenAide',
//    'UnicaenAlerte',
    'UnicaenIndicateur',
    'Referentiel',

+61 −0
Changes for documentation/release/3.1.6.md: 61 added lines, 0 removed lines.
Original line number Diff line number Diff line
**CHANGES version 3.1.6**

-----------

**Changements**

* Début du remplacement du système de synchronisation 
* Simplification de la gestion des missions principales

```sql
-- ----------------------------------------------------------------------------
-- NOUVEAUX PRIVILEGES (gestion des missions principales)
@@ -215,6 +224,58 @@ drop table fichemetier_activite;
drop table ficheposte_activite_specifique;
drop table activite

-- -----------------------------------
-- ADAPTATION NOUVELLE SYNCHRO
-- ------------------------------------

alter table agent_carriere_affectation drop constraint agent_affectation_pk;
alter table agent_carriere_affectation add constraint agent_carriere_affectation_pk primary key (id);
alter table agent_carriere_affectation drop column affectation_id;

-- ----------------------------------------------------------
-- RETRAIT DES PRIVILEGE DE DB IMPORT DEVENU NON UTILISE
-- ----------------------------------------------------------

delete from unicaen_privilege_privilege p
where p.id in (
    select p.id
    from unicaen_privilege_privilege p
    join unicaen_privilege_categorie upc on p.categorie_id = upc.id
    where upc.code  like 'unicaen-db-import-%'
);

delete from unicaen_privilege_categorie upc
where upc.code  like 'unicaen-db-import-%';

-- RETRAIT DES REF VERS L'ANCIEN DB IMPORT --

alter table formation drop constraint formation_source_id_fk;
alter table formation alter column source_id type varchar(128);
alter table formation_groupe drop constraint formation_groupe_source_id_fk;
alter table formation_groupe alter column source_id type varchar(128);
alter table formation_seance drop constraint fformation_seance_source_id_fk;
alter table formation_seance alter column source_id type varchar(128);
alter table formation_presence drop constraint formation_presence_source_id_fk;
alter table formation_presence alter column source_id type varchar(128);
alter table formation_instance drop constraint formation_instance_source_id_fk;
alter table formation_instance alter column source_id type varchar(128);
alter table formation_instance_inscrit drop constraint formation_instance_inscrit_source_id_fk;
alter table formation_instance_inscrit alter column source_id type varchar(128);
alter table formation_instance_frais drop constraint formation_instance_frais_source_id_fk;
alter table formation_instance_frais alter column source_id type varchar(128);

alter table structure_responsable drop constraint structure_responsable_source_id_fk;
alter table structure_responsable alter column source_id type varchar(128);
alter table structure_gestionnaire drop constraint structure_gestionnaire_source_id_fk;
alter table structure_gestionnaire alter column source_id type varchar(128);

alter table formation drop column theme_id;
drop table formation_theme cascade;
```

```bash
composer update unicaen/utilisateur
composer update unicaen/authentification
composer remove unicaen/octopus
composer remove unicaen/db-import
```
 No newline at end of file
+2 −4
Changes for module/Application/src/Application/Entity/Db/Interfaces/HasSourceInterface.php: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -2,16 +2,14 @@

namespace Application\Entity\Db\Interfaces;

use UnicaenDbImport\Entity\Db\Source;

interface HasSourceInterface {

    const SOURCE_EMC2 = 'EMC2';
    const SOURCE_OCTOPUS = 'OCTOPUS';
    const SOURCE_LAGAF = 'LAGAF';

    public function getSource() : ?Source;
    public function getSource() : ?string;
    public function getIdSource() : ?string;
    public function setSource(?Source $source);
    public function setSource(?string $source);
    public function setIdSource(?string $id);
}
 No newline at end of file
+3 −14
Changes for module/Application/src/Application/Entity/Db/Traits/HasSourceTrait.php: 3 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -2,34 +2,23 @@

namespace Application\Entity\Db\Traits;

use UnicaenDbImport\Entity\Db\Source;

trait HasSourceTrait {

    private ?Source $source = null;
    private ?string $source = null;
    private ?string $idSource = null;

    /**
     * @return Source|null
     */
    public function getSource() : ?Source
    public function getSource() : ?string
    {
        return $this->source;
    }

    /**
     * @return string|null
     */
    public function getIdSource() : ?string
    {
        return $this->idSource;
    }

    /**
     * @param Source|null $source
     * @return self
     */
    public function setSource(?Source $source) : self
    public function setSource(?string $source) : self
    {
        $this->source = $source;
        return $this;
Loading