fix wrong date format in field notes, fix warning if user has no logs

OpencachingDeutschland · Aug 24, 2016 · 852f696 · 852f696
1 parent 9e5034d
commit 852f696
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/htdocs/app/Resources/translations/messages.en.yml b/htdocs/app/Resources/translations/messages.en.yml
@@ -14,6 +14,7 @@ field_notes:
 
         # Desc: Log type "%type%" is not implemented.
         log_type_not_implemented: 'Log type "%type%" is not implemented.'
+        wrong_date_format: 'The date in this file is in wrong format.'
         wrong_file_format: 'This file seems not to be a field notes file.'
 
     field_notes: 'Field Notes'

diff --git a/htdocs/src/AppBundle/Controller/FieldNotes/FieldNotesController.php b/htdocs/src/AppBundle/Controller/FieldNotes/FieldNotesController.php
@@ -35,7 +35,7 @@ public function indexAction(Request $request)
             $file = $form->getData()[UploadFieldNotesType::FIELD_FILE];
             try {
                 $ignoreDate = null;
-                if ($form->getData()[UploadFieldNotesType::FIELD_IGNORE] && $form->getData()[UploadFieldNotesType::FIELD_IGNORE_DATE]) {
+                if (!empty($form->getData()[UploadFieldNotesType::FIELD_IGNORE])) {
                     $ignoreDate = DateUtil::dateTimeFromMySqlFormat($form->getData()[UploadFieldNotesType::FIELD_IGNORE_DATE]);
                 }
                 $fieldNoteService->importFromFile($file->getRealPath(), $user->getId(), $ignoreDate);

diff --git a/htdocs/src/AppBundle/Exception/WrongDateFormatException.php b/htdocs/src/AppBundle/Exception/WrongDateFormatException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace AppBundle\Exception;
+
+class WrongDateFormatException extends \Exception
+{
+}
diff --git a/htdocs/src/AppBundle/Service/FieldNoteService.php b/htdocs/src/AppBundle/Service/FieldNoteService.php
@@ -3,6 +3,7 @@
 namespace AppBundle\Service;
 
 use AppBundle\Entity\FieldNote;
+use AppBundle\Exception\WrongDateFormatException;
 use AppBundle\Exception\WrongFileFormatException;
 use AppBundle\Service\Interfaces\FieldNoteServiceInterface;
 use AppBundle\Service\Traits\ErrorTrait;
@@ -45,6 +46,7 @@ public function __construct(EntityManagerInterface $entityManager, TranslatorInt
      * @param null|\DateTime $ignoreBeforeDate
      *
      * @return bool
+     * @throws \AppBundle\Exception\WrongDateFormatException
      * @throws \AppBundle\Exception\WrongFileFormatException
      */
     public function importFromFile($fileName, $userId, DateTime $ignoreBeforeDate = null)
@@ -65,6 +67,11 @@ public function importFromFile($fileName, $userId, DateTime $ignoreBeforeDate =
                 $data[1],
                 new DateTimeZone('UTC')
             );
+            if (!$date) {
+                throw new WrongDateFormatException(
+                    $this->translator->trans('field_notes.error.wrong_date_format')
+                );
+            }
 
             if ($ignoreBeforeDate !== null && $date < $ignoreBeforeDate) {
                 continue;