Interesses : add status column

2 files changed, 54 insertions, 15 deletions

diff --git a/schema/enum-tables-data-mysql.sql b/schema/enum-tables-data-mysql.sql
index 375f511..9e11bb5 100644
--- a/schema/enum-tables-data-mysql.sql
+++ b/schema/enum-tables-data-mysql.sql
@@ -49,9 +49,7 @@ DROP TABLE IF EXISTS `adherent_statuts`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `adherent_statuts` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `title` (`title`)
+  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -61,7 +59,7 @@ CREATE TABLE `adherent_statuts` (
 
 LOCK TABLES `adherent_statuts` WRITE;
 /*!40000 ALTER TABLE `adherent_statuts` DISABLE KEYS */;
-INSERT INTO `adherent_statuts` VALUES (2,'☐ Fiche ☐ Prélev'),(4,'☐ Fiche ☑ Prélev'),(3,'☑ Fiche ☐ Prélev'),(5,'☑ Fiche ☑ Prélev'),(7,'A relancer'),(8,'Bénévole sans service'),(6,'Incohérent'),(1,'Résilié');
+INSERT INTO `adherent_statuts` VALUES (1),(2),(3),(4),(5),(6),(7),(8);
 /*!40000 ALTER TABLE `adherent_statuts` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -124,10 +122,10 @@ CREATE TABLE `equipement_modeles` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `constructeur` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
   `modele` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `profile` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
-  `revision` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
+  `profile` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `revision` varchar(8) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Modèles d''équipements';
+) ENGINE=InnoDB AUTO_INCREMENT=44 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Modèles d''équipements';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -136,7 +134,7 @@ CREATE TABLE `equipement_modeles` (
 
 LOCK TABLES `equipement_modeles` WRITE;
 /*!40000 ALTER TABLE `equipement_modeles` DISABLE KEYS */;
-INSERT INTO `equipement_modeles` VALUES (1,'Mikrotik','RouterBoard 750UP','',''),(2,'TP-Link','TL-WR740ND v??','TLWR740','4'),(3,'TP-Link','TL-WR740ND v1-3','',''),(4,'TP-Link','TL-WR740ND v4','TLWR740','4'),(5,'TP-Link','TL-WR740ND v5','',''),(6,'TP-Link','TL-WR841ND v9','TLWR841','9'),(7,'TP-Link','TL-WR841ND v10','','10'),(8,'TP-Link','TL-WR841ND v11','','11'),(10,'Ubiquiti','AirFiber 5X + AF-5G30-S45','',''),(11,'Ubiquiti','AirFiber 5X + Mars 25dBi','',''),(12,'Ubiquiti','NanoBeam M5 16','',''),(13,'Ubiquiti','NanoBeam M5 19','',''),(14,'Ubiquiti','NanoBridge M5 G22','',''),(15,'Ubiquiti','NanoBridge M5 G25','',''),(16,'Ubiquiti','Nanostation M5','',''),(17,'Ubiquiti','Nanostation M5 Loco','',''),(18,'Ubiquiti','PowerBeam M5 400','',''),(19,'Ubiquiti','Rocket M5','',''),(20,'Ubiquiti','ToughSwitch TS5','',''),(21,'Ubiquiti','ToughSwitch TS8','',''),(40,'Netonix','WS-6-MINI','',''),(41,'Mikrotik','RB2011UiAS-2HnD-IN',' ',' ');
+INSERT INTO `equipement_modeles` VALUES (1,'Mikrotik','RouterBoard 750UP','',''),(2,'TP-Link','TL-WR740ND v??','TLWR740','4'),(3,'TP-Link','TL-WR740ND v1-3','',''),(4,'TP-Link','TL-WR740ND v4','TLWR740','4'),(5,'TP-Link','TL-WR740ND v5','',''),(6,'TP-Link','TL-WR841ND v9','TLWR841','9'),(7,'TP-Link','TL-WR841ND v10','','10'),(8,'TP-Link','TL-WR841ND v11','','11'),(10,'Ubiquiti','AirFiber 5X + AF-5G30-S45','',''),(11,'Ubiquiti','AirFiber 5X + Mars 25dBi','',''),(12,'Ubiquiti','NanoBeam M5 16','',''),(13,'Ubiquiti','NanoBeam M5 19','',''),(14,'Ubiquiti','NanoBridge M5 G22','',''),(15,'Ubiquiti','NanoBridge M5 G25','',''),(16,'Ubiquiti','Nanostation M5','',''),(17,'Ubiquiti','Nanostation M5 Loco','',''),(18,'Ubiquiti','PowerBeam M5 400','',''),(19,'Ubiquiti','Rocket M5','',''),(20,'Ubiquiti','ToughSwitch TS5','',''),(21,'Ubiquiti','ToughSwitch TS8','',''),(40,'Netonix','WS-6-MINI','',''),(41,'Mikrotik','RB2011UiAS-2HnD-IN',' ',' '),(42,'Ubiquiti','EdgeMax EdgeSwitch 24-Port 250W','',''),(43,'VM','Linux KVM','','');
 /*!40000 ALTER TABLE `equipement_modeles` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -164,6 +162,31 @@ INSERT INTO `equipement_modes` VALUES ('br-ap'),('br-sta'),('rt-main'),('rt-soho
 UNLOCK TABLES;
 
 --
+-- Table structure for table `interesse_statuts`
+--
+
+DROP TABLE IF EXISTS `interesse_statuts`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `interesse_statuts` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `title` (`title`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `interesse_statuts`
+--
+
+LOCK TABLES `interesse_statuts` WRITE;
+/*!40000 ALTER TABLE `interesse_statuts` DISABLE KEYS */;
+INSERT INTO `interesse_statuts` VALUES (5,'Abandon'),(4,'Artisan envoyé'),(2,'Éligible'),(1,'Néant'),(3,'Référent associé');
+/*!40000 ALTER TABLE `interesse_statuts` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
 -- Table structure for table `periodicites`
 --
 
@@ -248,4 +271,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-03-12 14:58:03
+-- Dump completed on 2016-03-13 22:06:30
diff --git a/schema/schema-mysql.sql b/schema/schema-mysql.sql
index 06ec3e4..0f14b79 100644
--- a/schema/schema-mysql.sql
+++ b/schema/schema-mysql.sql
@@ -61,9 +61,7 @@ DROP TABLE IF EXISTS `adherent_statuts`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `adherent_statuts` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `title` (`title`)
+  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -149,8 +147,8 @@ CREATE TABLE `equipement_modeles` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `constructeur` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
   `modele` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `profile` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
-  `revision` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
+  `profile` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `revision` varchar(8) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Modèles d''équipements';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -206,6 +204,21 @@ CREATE TABLE `equipements` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `interesse_statuts`
+--
+
+DROP TABLE IF EXISTS `interesse_statuts`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `interesse_statuts` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `title` (`title`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `interesses`
 --
 
@@ -215,6 +228,7 @@ DROP TABLE IF EXISTS `interesses`;
 CREATE TABLE `interesses` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `date_demande` date NOT NULL,
+  `interesse_statut_id` int(11) NOT NULL,
   `civilite_id` int(11) NOT NULL,
   `nom` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
   `prenom` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
@@ -229,6 +243,8 @@ CREATE TABLE `interesses` (
   UNIQUE KEY `id` (`id`),
   KEY `civilite_id` (`civilite_id`),
   KEY `ville_id` (`ville_id`),
+  KEY `interesse_statut_id` (`interesse_statut_id`),
+  CONSTRAINT `interesses_ibfk_3` FOREIGN KEY (`interesse_statut_id`) REFERENCES `interesse_statuts` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `interesses_ibfk_1` FOREIGN KEY (`civilite_id`) REFERENCES `civilites` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `interesses_ibfk_2` FOREIGN KEY (`ville_id`) REFERENCES `villes` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -738,4 +754,4 @@ CREATE TABLE `villes` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-03-12  0:30:48
+-- Dump completed on 2016-03-13 22:06:30