Fix teacher remove

data/db/schema.mysql.sql

@@ -224,7 +224,8 @@ INSERT INTO `itemcategory` (`id`,`name`,`groupflag`,`sort`) VALUES
 (120,'ΣΕΤ ΡΟΜΠΟΤΙΚΗΣ ΔΗΜΟΤΙΚΟΥ', 1,20),
 (121,'ΣΕΤ ΡΟΜΠΟΤΙΚΗΣ ΓΥΜΝΑΣΙΟΥ', 1,21),
 (122,'ΣΕΤ ΡΟΜΠΟΤΙΚΗΣ ΛΥΚΕΙΟΥ', 1,22),
-(123,'ΔΙΑΔΡΑΣΤΙΚΟ ΣΥΣΤΗΜΑ (INTERACTIVE SET)', 1,23);
+(123,'ΔΙΑΔΡΑΣΤΙΚΟ ΣΥΣΤΗΜΑ (INTERACTIVE SET)', 1,23),
+(124,'ΜΟΝΑΔΑ ΑΔΙΑΛΕΙΠΤΗΣ ΠΑΡΟΧΗΣ ΡΕΥΜΑΤΟΣ (UPS)', 1, 24);
 /*!40000 ALTER TABLE `itemcategory` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -401,9 +402,6 @@ UNLOCK TABLES;
 -- Table structure for table `school`
 --
 
-DROP TABLE IF EXISTS `school`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
 DROP TABLE IF EXISTS `school`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -588,7 +586,7 @@ CREATE TABLE `softwarecategory` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 
 --
@@ -643,7 +641,7 @@ DROP TABLE IF EXISTS `tpesurvey`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `tpesurvey` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-  `teacher_id` int(11) unsigned NOT NULL,
+  `teacher_id` int(11) unsigned DEFAULT NULL,
   `already_using_tpe` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
   `knowledge_level` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
   `assets_in_use` text COLLATE utf8mb4_unicode_ci,
@@ -663,7 +661,7 @@ CREATE TABLE `tpesurvey` (
   PRIMARY KEY (`id`),
   UNIQUE KEY `teacher_id_UNIQUE` (`teacher_id`),
   KEY `index_foreignkey_tpesurvey_teacher` (`teacher_id`),
-  CONSTRAINT `c_fk_tpesurvey_teacher_id` FOREIGN KEY (`teacher_id`) REFERENCES `teacher` (`id`) ON UPDATE CASCADE
+  CONSTRAINT `c_fk_tpesurvey_teacher_id` FOREIGN KEY (`teacher_id`) REFERENCES `teacher` (`id`) ON UPDATE CASCADE ON DELETE SET NULL
 ) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 

module/application/templates/about.twig

@@ -77,6 +77,7 @@
                     <li>ΚΩΔΙΚΟΣ 21 - ΣΕΤ ΡΟΜΠΟΤΙΚΗΣ ΓΥΜΝΑΣΙΟΥ</li> 
                     <li>ΚΩΔΙΚΟΣ 22 - ΣΕΤ ΡΟΜΠΟΤΙΚΗΣ ΛΥΚΕΙΟΥ</li> 
                     <li>ΚΩΔΙΚΟΣ 23 - ΔΙΑΔΡΑΣΤΙΚΟ ΣΥΣΤΗΜΑ (INTERACTIVE SET)</li> 
+                    <li>ΚΩΔΙΚΟΣ 24 - ΜΟΝΑΔΑ ΑΔΙΑΛΕΙΠΤΗΣ ΠΑΡΟΧΗΣ ΡΕΥΜΑΤΟΣ (UPS)</li> 
                 </ul>
                 <p class="text-center">
                     <a class="btn btn-primary" href="{{ base_url() }}/files/prodiagrafes_edulabs.pdf">ΑΝΑΛΥΤΙΚΕΣ ΠΡΟΔΙΑΓΡΑΦΕΣ ΕΞΟΠΛΙΣΜΟΥ</a>

module/application_form/data/migration-170207-01-up.mysql.sql

+
+LOCK TABLES `itemcategory` WRITE;
+/*!40000 ALTER TABLE `itemcategory` DISABLE KEYS */;
+INSERT INTO `itemcategory` (`id`,`name`,`groupflag`,`sort`) VALUES 
+(124,'ΜΟΝΑΔΑ ΑΔΙΑΛΕΙΠΤΗΣ ΠΑΡΟΧΗΣ ΡΕΥΜΑΤΟΣ (UPS)', 1, 24);
+/*!40000 ALTER TABLE `itemcategory` ENABLE KEYS */;
+UNLOCK TABLES;
+
+ALTER TABLE `itemcategory` AUTO_INCREMENT = 200;
+
+alter table `applicationform` modify `received_by` varchar(255);
+
+lock tables `tpesurvey` write;
+alter table `tpesurvey` modify `teacher_id` int(11) unsigned null;
+alter table `tpesurvey` drop foreign key `c_fk_tpesurvey_teacher_id`;
+alter table `tpesurvey` add constraint `c_fk_tpesurvey_teacher_id` 
+foreign key (`teacher_id`) 
+references `teacher` (`id`) on update cascade on delete set null;
+unlock tables;

module/schools/bootstrap.php

@@ -50,7 +50,8 @@ return function (Slim\App $app) {
 
         $container[Action\Staff\DeleteTeacher::class] = function ($c) {
             return new Action\Staff\DeleteTeacher(
-                $c->get(Service\StaffServiceInterface::class)
+                $c->get(Service\StaffServiceInterface::class),
+                $c->get('logger')
             );
         };
 

module/schools/src/Action/Staff/DeleteTeacher.php

@@ -7,25 +7,32 @@
  * @copyright Copyright (c) 2008-2015 Greek Free/Open Source Software Society (https://gfoss.ellak.gr/)
  * @license GNU GPLv3 http://www.gnu.org/licenses/gpl-3.0-standalone.html
  */
-
 namespace GrEduLabs\Schools\Action\Staff;
 
 use Exception;
 use GrEduLabs\Schools\Service\StaffServiceInterface;
 use Slim\Http\Request;
 use Slim\Http\Response;
+use Monolog\Logger;
 
 class DeleteTeacher
 {
+
     /**
      *
      * @var StaffServiceInterface
      */
     private $staffService;
 
-    public function __construct(StaffServiceInterface $staffService)
+    /**
+     * @var Monolog\Logger
+     */
+    private $logger;
+
+    public function __construct(StaffServiceInterface $staffService, Logger $logger)
     {
         $this->staffService = $staffService;
+        $this->logger = $logger;
     }
 
     public function __invoke(Request $req, Response $res)
@@ -50,6 +57,10 @@ class DeleteTeacher
         }
 
         try {
+            $teacher_data = $this->staffService->getTeacherById($id);
+            unset($teacher_data['telephone']);
+            unset($teacher_data['email']);
+            $this->logger->info(sprintf('Call staffService->removeTeacher(%d) = %s', $id, var_export($teacher_data, true)));
             $this->staffService->removeTeacher($id);
             $res = $res->withStatus(204);
         } catch (Exception $ex) {