tests

anstiftung · Nov 30, 2023 · fc410b4 · fc410b4
1 parent 49d66bb
commit fc410b4
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 33 deletions.
diff --git a/config/sql/info-sheets-download.sql b/config/sql/info-sheets-download.sql
@@ -7,7 +7,6 @@ SELECT
  DATE_FORMAT(i.created, '%Y') - i.device_age as "Baujahr",
  DATE_FORMAT(e.datumstart, '%d.%m.%Y') as "Datum Reparaturveranstaltung",
  defect_description as Fehlerbeschreibung,
- defect_found_ffo2.name as "Fehler gefunden?",
  defect_found_ffo3.name as Reparaturerfolg,
  defect_found_ffo4.name as "Reparatur: vertagt",
  defect_found_ffo5.name as "Reparatur: nicht erfolgt",
@@ -20,12 +19,11 @@ LEFT JOIN categories c ON c.id = i.category_id
 LEFT JOIN categories pc ON pc.id = c.parent_id
 JOIN events e ON e.uid = i.event_uid
 JOIN workshops w ON e.workshop_uid = w.uid
-LEFT JOIN form_field_options defect_found_ffo2 ON defect_found_ffo2.form_field_id = 2 AND defect_found_ffo2.value = i.defect_found
 LEFT JOIN form_field_options defect_found_ffo3 ON defect_found_ffo3.form_field_id = 3 AND defect_found_ffo3.value = i.defect_found_reason
 LEFT JOIN form_field_options defect_found_ffo4 ON defect_found_ffo4.form_field_id = 4 AND defect_found_ffo4.value = i.repair_postponed_reason
 LEFT JOIN form_field_options defect_found_ffo5 ON defect_found_ffo5.form_field_id = 5 AND defect_found_ffo5.value = i.no_repair_reason
 LEFT JOIN form_field_options defect_found_ffo6 ON defect_found_ffo6.form_field_id = 6 AND defect_found_ffo6.value = i.device_must_not_be_used_anymore
 WHERE 1
 AND i.status = 1
 AND w.uid = :workshopUid
-ORDER by e.datumstart DESC
+ORDER by e.datumstart DESC, i.uid DESC
diff --git a/config/sql/info-sheets-full-download.sql b/config/sql/info-sheets-full-download.sql
@@ -12,7 +12,6 @@ SELECT
  DATE_FORMAT(i.created, '%Y') - i.device_age as "year_of_manufacture",
  TRIM(
  CONCAT(
- COALESCE(ffoeiA.repair_status, ''), ' ',
  COALESCE(ffoeiB.repair_status, ''), ' ',
  COALESCE(ffoeiC.repair_status, ''), ' ',
  COALESCE(ffoeiD.repair_status, ''), ' ',
@@ -21,14 +20,12 @@ SELECT
  ) as "repair_status",
  TRIM(
  CONCAT(
- COALESCE(ffoeiA.repair_barrier_if_end_of_life, ''), ' ',
  COALESCE(ffoeiB.repair_barrier_if_end_of_life, ''), ' ',
  COALESCE(ffoeiC.repair_barrier_if_end_of_life, ''), ' ',
  COALESCE(ffoeiD.repair_barrier_if_end_of_life, ''), ' ',
  COALESCE(ffoeiE.repair_barrier_if_end_of_life, '')
  )
  ) as "repair_barrier_if_end_of_life",
- defect_found_ffo2.name as "defect_found_name",
  defect_found_ffo3.name as "defect_found_reason",
  defect_found_ffo4.name as "repair_postponed_reason",
  defect_found_ffo5.name as "no_repair_reason",
@@ -48,12 +45,10 @@ LEFT JOIN ords_categories oc ON c.ords_category_id = oc.id
 JOIN events e ON e.uid = i.event_uid
 JOIN workshops w ON e.workshop_uid = w.uid
 LEFT JOIN countries country ON w.country_code = country.code
-LEFT JOIN form_field_options defect_found_ffo2 ON defect_found_ffo2.form_field_id = 2 AND defect_found_ffo2.value = i.defect_found
 LEFT JOIN form_field_options defect_found_ffo3 ON defect_found_ffo3.form_field_id = 3 AND defect_found_ffo3.value = i.defect_found_reason
 LEFT JOIN form_field_options defect_found_ffo4 ON defect_found_ffo4.form_field_id = 4 AND defect_found_ffo4.value = i.repair_postponed_reason
 LEFT JOIN form_field_options defect_found_ffo5 ON defect_found_ffo5.form_field_id = 5 AND defect_found_ffo5.value = i.no_repair_reason
 LEFT JOIN form_field_options defect_found_ffo6 ON defect_found_ffo6.form_field_id = 6 AND defect_found_ffo6.value = i.device_must_not_be_used_anymore
-LEFT JOIN form_field_options_extra_infos ffoeiA ON ffoeiA.form_field_options_id = defect_found_ffo2.id
 LEFT JOIN form_field_options_extra_infos ffoeiB ON ffoeiB.form_field_options_id = defect_found_ffo3.id
 LEFT JOIN form_field_options_extra_infos ffoeiC ON ffoeiC.form_field_options_id = defect_found_ffo4.id
 LEFT JOIN form_field_options_extra_infos ffoeiD ON ffoeiD.form_field_options_id = defect_found_ffo5.id

diff --git a/tests/Fixture/FormFieldOptionsFixture.php b/tests/Fixture/FormFieldOptionsFixture.php
@@ -46,20 +46,6 @@ public function init(): void
  'name' => '',
  'status' => 1,
  ],
- [
- 'id' => 6,
- 'form_field_id' => 2,
- 'value' => 1,
- 'name' => '',
- 'status' => 1,
- ],
- [
- 'id' => 7,
- 'form_field_id' => 2,
- 'value' => 0,
- 'name' => '',
- 'status' => 1,
- ],
  [
  'id' => 8,
  'form_field_id' => 4,

diff --git a/tests/Fixture/FormFieldsFixture.php b/tests/Fixture/FormFieldsFixture.php
@@ -17,12 +17,6 @@ public function init(): void
  'identifier' => 'power_supply',
  'status' => 1,
  ],
- [
- 'id' => 2,
- 'name' => 'Fehler gefunden?',
- 'identifier' => 'defect_found',
- 'status' => 1,
- ],
  [
  'id' => 3,
  'name' => 'Reparatur',

diff --git a/tests/TestCase/Controller/InfoSheetsControllerTest.php b/tests/TestCase/Controller/InfoSheetsControllerTest.php
@@ -35,7 +35,6 @@ class InfoSheetsControllerTest extends AppTestCase
  ]
  ],
  'defect_description' => '',
- 'defect_found' => '',
  'defect_found_reason' => 2,
  'repair_postponed_reason' => 3,
  'no_repair_reason' => '',
@@ -54,7 +53,6 @@ public function testAddInfoSheetValidations()
  );
  $this->assertResponseContains('Bitte gib die Fehlerbeschreibung an (maximal 1.000 Zeichen).');
  $this->assertResponseContains('Bitte wähle eine Kategorie aus.');
- $this->assertResponseContains('Wurde der Fehler gefunden?');
  }
 
  public function testAddInfoSheetOk()
@@ -63,7 +61,6 @@ public function testAddInfoSheetOk()
  $this->newInfoSheetData['defect_description'] = 'Defect description';
  $this->newInfoSheetData['device_name'] = 'Device name';
  $this->newInfoSheetData['category_id'] = 87;
- $this->newInfoSheetData['defect_found'] = 1;
  $this->newInfoSheetData['device_age'] = 1;
  $this->post(
  Configure::read('AppConfig.htmlHelper')->urlInfoSheetNew(6),

diff --git a/tests/comparisons/info-sheets-download.csv b/tests/comparisons/info-sheets-download.csv
@@ -1,2 +1,2 @@
-Laufzettel-UID,Oberkategorie,Unterkategorie,Marke,Gerät/Gegenstand,Baujahr,"Datum Reparaturveranstaltung",Fehlerbeschreibung,"Fehler gefunden?",Reparaturerfolg,"Reparatur: vertagt","Reparatur: nicht erfolgt","Reparatur: Abbruch","Keine Reparatur, weil",Url
-7,,,,,,01.01.2040,,,,,,,,"https://www.reparatur-initiativen.de/test-workshop?event=6,2040-01-01"
+Laufzettel-UID,Oberkategorie,Unterkategorie,Marke,Gerät/Gegenstand,Baujahr,"Datum Reparaturveranstaltung",Fehlerbeschreibung,Reparaturerfolg,"Reparatur: vertagt","Reparatur: nicht erfolgt","Reparatur: Abbruch","Keine Reparatur, weil",Url
+7,,,,,,01.01.2040,,,,,,,"https://www.reparatur-initiativen.de/test-workshop?event=6,2040-01-01"