fix(letter): expiry and valid dates were wrong

src/Handler/Utils/DateTime.hs

@@ -301,6 +301,11 @@ addLocalDays n utct = localTimeToUTCTZ appTZ newLocal
     newDay   = addDays n oldDay
     newLocal = oldLocal { localDay = newDay }
 
+-- This is just a Remineder
+-- addMonths :: Integer -> UTCTime -> UTCTime
+-- addMonths = addGregorianMonthsRollOver
+
+
 ----------------------
 -- CalendarDiffDays --
 ----------------------

src/Handler/Utils/Qualification.hs

@@ -19,10 +19,14 @@ import qualified Database.Esqueleto.Utils as E
 
 import Handler.Utils.Widgets  (statusHtml)
 
+-- | Compute new valid date from old one and from validDuration in months
+--   Mainly to document which add months functions to use
+computeNewValidDate :: Integral a => a -> Day -> Day
+computeNewValidDate = addGregorianMonthsRollOver . toInteger
+
 statusQualificationBlock :: Bool -> Html
 statusQualificationBlock s = statusHtml (bool Error Success s) $ iconQualificationBlock s
 
-
 -- needs refactoring, probbably no longer helpful
 mkQualificationBlocked :: QualificationStandardReason -> UTCTime -> QualificationUserId -> QualificationUserBlock
 mkQualificationBlocked reason qualificationUserBlockFrom qualificationUserBlockQualificationUser = QualificationUserBlock{..}
@@ -190,7 +194,7 @@ renewValidQualificationUsers qid reason renewalTime uids =
           maxValidTo  = addGregorianMonthsRollOver (toInteger $ renewalMonths `div` 2) cutoffday
           quEnts      = filter (\q -> maxValidTo >= (q ^. _entityVal . _qualificationUserValidUntil)) quEntsAll
       forM_ quEnts $ \(Entity quId QualificationUser{..}) -> do 
-        let newValidTo = addGregorianMonthsRollOver (toInteger renewalMonths) qualificationUserValidUntil        
+        let newValidTo = computeNewValidDate renewalMonths qualificationUserValidUntil
         update quId [ QualificationUserValidUntil   =. newValidTo
                     , QualificationUserLastRefresh  =. cutoffday
                     ]

src/Utils/Print/RenewQualification.hs

@@ -17,6 +17,7 @@ import Data.FileEmbed (embedFile)
 
 import Utils.Print.Letters
 import Handler.Utils.Widgets (nameHtml) -- , nameHtml')
+import Handler.Utils.Qualification (computeNewValidDate)
 
 -- TODO: refactor me and turn me into a qualification property (elearningOnly)
 qualificationPractical :: Text -> Bool
@@ -111,7 +112,7 @@ instance MDLetter LetterRenewQualification where
   letterMeta l@LetterRenewQualification{..} DateTimeFormatter{ format } lang Entity{entityKey=rcvrId, entityVal=User{userDisplayName}} = 
     let LetterRenewQualificationData{..} = letterRenewalQualificationFData l 
         isSupervised = rcvrId /= qualHolderID
-        newExpire = addDays (fromIntegral $ fromMaybe 0 qualDuration) qualExpiry
+        newExpire = computeNewValidDate (fromMaybe 0 qualDuration) qualExpiry
         (qArea, qFormal, qLicence) = qualificationText lang qualName qualShort
     in mkMeta $
       guardMonoid isSupervised

templates/letter/fraport_renewal.md

@@ -59,15 +59,16 @@ $if(is-de)$
 <!-- deutsche Version des Briefes  -->
 
 $if(reminder)$
-  dies ist die **letzte Erinnerung**:
+ dies ist die **letzte Erinnerung**: Bis $date$ wurde das E-Learning noch nicht abgeschlossen. Um
-$endif$
+else$
  um
+$endif$
 $if(supervisor)$
  die $qformal$ von **{$examinee$}**
 $else$
  Ihre $qformal$
 $endif$
-zu verlängern, benötigen wir bis zum **$date$** den Nachweis, 
+zu verlängern, benötigen wir bis zum **$expiry$** den Nachweis, 
 dass die 
 $if(practical)$
  theoretische und praktische 
@@ -111,15 +112,17 @@ $else$
 
 <!-- englische Version des Briefes  -->
 $if(reminder)$
-  this is a last **reminder**: 
+ this is a last **reminder**: as of $date$, the e-learning has not been completed. In
+$else$
+ in
 $endif$
-in order to maintain 
+order to maintain
 $if(supervisor)$
  the $qformal$ of **$examinee$**,
 $else$
  your $qformal$,
 $endif$
-we require by **$date$**, that the 
+we require by **$expiry$**, that the 
 $if(practical)$
  theorectical and paractical
 $endif$
@@ -151,5 +154,4 @@ $if(practical)$
  an examination-style test drive within the runway system.
 $endif$  
 
-
 $endif$