Service title becomes SER-<sid> and not SER-<stype>-<aid>-<sid>. Add TL741ND v5.1.

3 files changed, 9 insertions, 9 deletions

diff --git a/generator/before-bake/config/bake_extra.php b/generator/before-bake/config/bake_extra.php
index 49f5023..bff1a9a 100644
--- a/generator/before-bake/config/bake_extra.php
+++ b/generator/before-bake/config/bake_extra.php
@@ -99,7 +99,7 @@ EOT
 		'title' => [ 
 			'glue' => '-',
 			'prefix' => 'SER',
-			'pieces' => ['service_type_id', 'adherent_id', 'id'],
+			'pieces' => ['id'],
 		],
 		'filters' => [ 
 			'service_type_id' => [
diff --git a/schema/enum-tables-data-mysql.sql b/schema/enum-tables-data-mysql.sql
index 1612dbc..84a1468 100644
--- a/schema/enum-tables-data-mysql.sql
+++ b/schema/enum-tables-data-mysql.sql
@@ -127,7 +127,7 @@ CREATE TABLE `equipement_modeles` (
   `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=45 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Modèles d''équipements';
+) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Modèles d''équipements';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -136,7 +136,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','TLWR740','5'),(6,'TP-Link','TL-WR841ND v9','TLWR841','9'),(7,'TP-Link','TL-WR841ND v10','TLWR841','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','',''),(44,'Netonix','8 ports','','');
+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.0','TLWR740','5'),(6,'TP-Link','TL-WR841ND v9','TLWR841','9'),(7,'TP-Link','TL-WR841ND v10','TLWR841','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','',''),(44,'Netonix','8 ports','',''),(45,'Ubiquiti','Nanostation M2 Loco','',''),(46,'TP-Link','TL-WR740ND v5.1','TLWR740','');
 /*!40000 ALTER TABLE `equipement_modeles` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -273,4 +273,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-04-23 14:09:11
+-- Dump completed on 2016-06-12 16:55:19
diff --git a/schema/schema-mysql.sql b/schema/schema-mysql.sql
index 21fc549..e107490 100644
--- a/schema/schema-mysql.sql
+++ b/schema/schema-mysql.sql
@@ -178,11 +178,11 @@ DROP TABLE IF EXISTS `equipements`;
 CREATE TABLE `equipements` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `uplink_id` int(11) DEFAULT NULL,
+  `service_id` int(11) DEFAULT NULL,
   `mac` char(17) COLLATE utf8_unicode_ci NOT NULL,
-  `ipmgmt_id` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
   `hostname` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
   `equipement_modele_id` int(11) NOT NULL,
-  `service_id` int(11) DEFAULT NULL,
+  `ipmgmt_id` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
   `relais_id` int(11) DEFAULT NULL,
   `equipement_mode_id` char(8) COLLATE utf8_unicode_ci NOT NULL,
   `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -644,7 +644,7 @@ CREATE TABLE `villes` (
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`gestion`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `v_api_gen_conf` AS select 'do_conf' AS `do_conf`,'actif' AS `etat`,concat_ws('-','SER',`s`.`service_type_id`,`a`.`id`,`s`.`id`) AS `svc_id`,`routeur`.`ipmgmt_id` AS `ip4_nexthop`,`ipp`.`ip4` AS `ip4_public`,`CALC_WANIP6LL`(`ipp`.`ip6`) AS `ip6_nexthop`,`ipp`.`ip6` AS `ip6_prefix` from ((((`services` `s` left join `service_types` `st` on((`st`.`id` = `s`.`service_type_id`))) left join `ippubliques` `ipp` on((`ipp`.`ip4` = `s`.`ippublique_id`))) left join `adherents` `a` on((`s`.`adherent_id` = `a`.`id`))) left join `equipements` `routeur` on(((`routeur`.`service_id` = `s`.`id`) and (`routeur`.`equipement_mode_id` in ('rt-soho','rt-sta'))))) where ((`s`.`service_type_id` in (2,3,4)) and (`s`.`service_statut_id` in (2,4)) and (`a`.`adherent_statut_id` <> 1)) */;
+/*!50001 VIEW `v_api_gen_conf` AS select 'do_conf' AS `do_conf`,'actif' AS `etat`,concat('SER-',`s`.`id`) AS `svc_id`,`routeur`.`ipmgmt_id` AS `ip4_nexthop`,`ipp`.`ip4` AS `ip4_public`,`CALC_WANIP6LL`(`ipp`.`ip6`) AS `ip6_nexthop`,`ipp`.`ip6` AS `ip6_prefix` from ((((`services` `s` left join `service_types` `st` on((`st`.`id` = `s`.`service_type_id`))) left join `ippubliques` `ipp` on((`ipp`.`ip4` = `s`.`ippublique_id`))) left join `adherents` `a` on((`s`.`adherent_id` = `a`.`id`))) left join `equipements` `routeur` on(((`routeur`.`service_id` = `s`.`id`) and (`routeur`.`equipement_mode_id` in ('rt-soho','rt-sta'))))) where ((`s`.`service_type_id` in (2,3,4)) and (`s`.`service_statut_id` in (2,4)) and (`a`.`adherent_statut_id` <> 1)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -701,7 +701,7 @@ CREATE TABLE `villes` (
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`gestion`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `v_relais_detail` AS select `re`.`title` AS `relais`,concat('CHD-',`a`.`id`) AS `adt`,concat_ws(' ',nullif(`a`.`raison`,''),`a`.`nom`,`a`.`prenom`) AS `adt_title`,`a`.`id` AS `adherent_id`,`s`.`id` AS `service_id`,concat('SER-',`s`.`service_type_id`,'-',`s`.`adherent_id`,'-',`s`.`id`) AS `service`,`rt`.`id` AS `routeur_equipement_id`,`a1`.`id` AS `antenne1_equipement_id`,`a2`.`id` AS `antenne2_equipement_id`,`re`.`id` AS `relais_id`,(case when (`rt`.`relais_id` is not null) then 1 when (`a1`.`relais_id` is not null) then 2 when (`a2`.`relais_id` is not null) then 3 else NULL end) AS `relais_degre`,`sec`.`id` AS `secteur_id` from ((((((`adherents` `a` left join `services` `s` on((`s`.`adherent_id` = `a`.`id`))) left join `equipements` `rt` on((`rt`.`service_id` = `s`.`id`))) left join `equipements` `a1` on((`a1`.`id` = `rt`.`uplink_id`))) left join `equipements` `a2` on((`a2`.`id` = `a1`.`uplink_id`))) left join `relais` `re` on((`re`.`id` = coalesce(`rt`.`relais_id`,`a1`.`relais_id`,`a2`.`relais_id`)))) left join `secteurs` `sec` on((`sec`.`id` = `re`.`secteur_id`))) where ((`a`.`adherent_statut_id` <> 1) and (`s`.`service_type_id` in (2,3,4)) and (`s`.`service_statut_id` in (1,2,4))) order by 1 */;
+/*!50001 VIEW `v_relais_detail` AS select `re`.`title` AS `relais`,concat('CHD-',`a`.`id`) AS `adt`,concat_ws(' ',nullif(`a`.`raison`,''),`a`.`nom`,`a`.`prenom`) AS `adt_title`,`a`.`id` AS `adherent_id`,`s`.`id` AS `service_id`,concat('SER-',`s`.`id`) AS `service`,`rt`.`id` AS `routeur_equipement_id`,`a1`.`id` AS `antenne1_equipement_id`,`a2`.`id` AS `antenne2_equipement_id`,`re`.`id` AS `relais_id`,(case when (`rt`.`relais_id` is not null) then 1 when (`a1`.`relais_id` is not null) then 2 when (`a2`.`relais_id` is not null) then 3 else NULL end) AS `relais_degre`,`sec`.`id` AS `secteur_id` from ((((((`adherents` `a` left join `services` `s` on((`s`.`adherent_id` = `a`.`id`))) left join `equipements` `rt` on((`rt`.`service_id` = `s`.`id`))) left join `equipements` `a1` on((`a1`.`id` = `rt`.`uplink_id`))) left join `equipements` `a2` on((`a2`.`id` = `a1`.`uplink_id`))) left join `relais` `re` on((`re`.`id` = coalesce(`rt`.`relais_id`,`a1`.`relais_id`,`a2`.`relais_id`)))) left join `secteurs` `sec` on((`sec`.`id` = `re`.`secteur_id`))) where ((`a`.`adherent_statut_id` <> 1) and (`s`.`service_type_id` in (2,3,4)) and (`s`.`service_statut_id` in (1,2,4))) order by 1 */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -791,4 +791,4 @@ CREATE TABLE `villes` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-05-22 12:10:25
+-- Dump completed on 2016-06-12 16:55:19