diff --git a/lib/Alchemy/Phrasea/Out/Module/PDFRecords.php b/lib/Alchemy/Phrasea/Out/Module/PDFRecords.php index 9e571508e7..b379cedc04 100644 --- a/lib/Alchemy/Phrasea/Out/Module/PDFRecords.php +++ b/lib/Alchemy/Phrasea/Out/Module/PDFRecords.php @@ -615,15 +615,15 @@ class PDFRecords extends PDF $this->pdf->SetX(105); $this->pdf->Cell(95, $h, $RIGHT_TEXT, "TBR", 1, "R", 1); - $this->pdf->SetY($y); - $this->pdf->write(7, $rec->getNumber(), '', false, 'C'); - $this->pdf->SetY($y2); - if($basket) { $ord = $basket->getElementByRecord($this->app, $rec)->getOrd(); $this->pdf->SetY($y); $this->pdf->SetX(10); $this->pdf->Cell(190, $h, $ord, "", 1, "C", 0); + } else { + $this->pdf->SetY($y); + $this->pdf->write(7, $rec->getNumber(), '', false, 'C'); + $this->pdf->SetY($y2); } if ($LEFT__TEXT == "" && is_file($LEFT__IMG)) { @@ -733,23 +733,22 @@ class PDFRecords extends PDF $this->pdf->Image($f, (210 - $finalWidth) / 2, $y, $finalWidth, $finalHeight); - if ($this->canDownload && !empty($this->downloadSubdef) && $rec->has_subdef($this->downloadSubdef)) { - $sd = $rec->get_subdef($this->downloadSubdef); - if ($sd->is_physically_present()) { - $this->pdf->SetXY($lmargin, $this->pdf->GetY() -1); - - $downloadLink = sprintf('%s', (string)$sd->get_permalink()->get_url()."&download=1", $this->app->trans("print:: download")); - - $this->pdf->writeHTML($downloadLink); - } - } - if ($miniConv != NULL) { foreach ($miniConv as $oneF) unlink($oneF); } $this->pdf->SetXY($lmargin, $y += ( $finalHeight + 5)); + if ($this->canDownload && !empty($this->downloadSubdef) && $rec->has_subdef($this->downloadSubdef)) { + $sd = $rec->get_subdef($this->downloadSubdef); + if ($sd->is_physically_present()) { + + $downloadLink = sprintf('%s', (string)$sd->get_permalink()->get_url()."&download=1", $this->app->trans("print:: download")); + + $this->pdf->writeHTML($downloadLink, true, false, false, true); + } + } + $this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12); $this->pdf->Write(5, $this->app->trans("print_feedback:: record title: ") . " "); $this->pdf->SetFont(PhraseaPDF::FONT, '', 12); diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index e4d5ffa081..1c460b5107 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -4724,7 +4724,7 @@ None of the selected records can be printed Keine der ausgewählte Datensätze können gedruckt werden - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig None of the selected records can be pushed. @@ -9930,7 +9930,7 @@ boutton::imprimer Drucken - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig boutton::modifier @@ -10559,7 +10559,7 @@ export:: erreur : aucun document selectionne Fehler: kein ausgewähltes Dokument - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig export:: telechargement @@ -12133,17 +12133,17 @@ print:: Can download subdef print:: Can download subdef - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: Choose subdef for preview print:: Choose subdef for preview - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: Choose subdef for thumbnail print:: Choose subdef for thumbnail - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: add and remember password to protect the pdf @@ -12173,22 +12173,22 @@ print:: download print:: download - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print:: element downloadable print:: element downloadable - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: element printable on preview model print:: element printable on preview model - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: element printable on thumbnail model print:: element printable on thumbnail model - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: image de choix et description @@ -12235,90 +12235,100 @@ print:: some options prod/actions/printer_default.html.twig + + print:: warning! Only available image for chosen subdef is printed + print:: warning! Only available image for chosen subdef is printed + prod/actions/printer_default.html.twig + + + print:: warning! Only available media for chosen subdef is downloadable + print:: warning! Only available media for chosen subdef is downloadable + prod/actions/printer_default.html.twig + print_feedback:: Document generated on : Drucken erzeugt am - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback active Feedback ist aktiviert - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback expired Feedback ist abgelaufen - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback expiring on : Erlischt am - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback initiated by : Feedback gesendet von - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback initiated on : Feedback Beginn am - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback on basket %name% Feedback auf Sammelkorb %name% - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Non Nein - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Oui Ja - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Participants : Teilnehmer : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Votes : Zustimmung : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: base name: Datenbank - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: document Uuid: Uuid Dokument - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: non voté unausgedrückt - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: originale filename: Originale Dateiname - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record id: Record id - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record title: Titel - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php prive diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 4bbb18cf71..19c418179e 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -4727,7 +4727,7 @@ None of the selected records can be printed None of the selected records can be printed - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig None of the selected records can be pushed. @@ -9933,7 +9933,7 @@ boutton::imprimer Print - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig boutton::modifier @@ -10562,7 +10562,7 @@ export:: erreur : aucun document selectionne Error : no document selected - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig export:: telechargement @@ -12136,17 +12136,17 @@ print:: Can download subdef print:: Can download subdef - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: Choose subdef for preview print:: Choose subdef for preview - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: Choose subdef for thumbnail print:: Choose subdef for thumbnail - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: add and remember password to protect the pdf @@ -12176,22 +12176,22 @@ print:: download print:: download - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print:: element downloadable print:: element downloadable - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: element printable on preview model print:: element printable on preview model - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: element printable on thumbnail model print:: element printable on thumbnail model - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: image de choix et description @@ -12238,90 +12238,100 @@ print:: some options prod/actions/printer_default.html.twig + + print:: warning! Only available image for chosen subdef is printed + print:: warning! Only available image for chosen subdef is printed + prod/actions/printer_default.html.twig + + + print:: warning! Only available media for chosen subdef is downloadable + print:: warning! Only available media for chosen subdef is downloadable + prod/actions/printer_default.html.twig + print_feedback:: Document generated on : Generated on : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback active Feedback session still opened - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback expired Feedback session closed - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback expiring on : Feedback expiring on : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback initiated by : Feedback initiated by : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback initiated on : Feedback initiated on : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback on basket %name% Feedback report on basket : %name% - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Non No - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Oui Yes - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Participants : Participants list : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Votes : Approvals : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: base name: Base Name : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: document Uuid: Document Unique Id : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: non voté Unexpressed - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: originale filename: Original file name : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record id: Record Id : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record title: Record Title : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php prive diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 80d8269d7a..88ccbf8afd 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -4724,7 +4724,7 @@ None of the selected records can be printed Aucun des documents sélectionnés ne peut être imprimé - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig None of the selected records can be pushed. @@ -9933,7 +9933,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le boutton::imprimer Imprimer - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig boutton::modifier @@ -10562,7 +10562,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le export:: erreur : aucun document selectionne Erreur : aucun document sélectionné - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig export:: telechargement @@ -12136,17 +12136,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le print:: Can download subdef print:: Can download subdef - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: Choose subdef for preview print:: Choose subdef for preview - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: Choose subdef for thumbnail print:: Choose subdef for thumbnail - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: add and remember password to protect the pdf @@ -12176,22 +12176,22 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le print:: download print:: download - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print:: element downloadable print:: element downloadable - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: element printable on preview model print:: element printable on preview model - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: element printable on thumbnail model print:: element printable on thumbnail model - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: image de choix et description @@ -12238,90 +12238,100 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le print:: some options prod/actions/printer_default.html.twig + + print:: warning! Only available image for chosen subdef is printed + print:: warning! Only available image for chosen subdef is printed + prod/actions/printer_default.html.twig + + + print:: warning! Only available media for chosen subdef is downloadable + print:: warning! Only available media for chosen subdef is downloadable + prod/actions/printer_default.html.twig + print_feedback:: Document generated on : Impression générée le : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback active Validation en cours - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback expired Validation Fermée - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback expiring on : Expire le : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback initiated by : Validation envoyée par : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback initiated on : Début de validation le : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback on basket %name% Rapport de validation de : %name% - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Non Non - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Oui Oui - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Participants : Participants : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Votes : Approbations : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: base name: Base : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: document Uuid: Id unique de document : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: non voté Non exprimé - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: originale filename: Nom de fichier : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record id: Record id: - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record title: Titre : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php prive diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 5679e89aa3..a83cf61e43 100644 --- a/resources/locales/messages.nl.xlf +++ b/resources/locales/messages.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -4736,7 +4736,7 @@ None of the selected records can be printed Geen enkele van de geselecteerde records kunnen geprint worden - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig None of the selected records can be pushed. @@ -9942,7 +9942,7 @@ boutton::imprimer Print - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig boutton::modifier @@ -10571,7 +10571,7 @@ export:: erreur : aucun document selectionne Erreur : geen enkel document geslecteerd - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig export:: telechargement @@ -12145,17 +12145,17 @@ print:: Can download subdef print:: Can download subdef - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: Choose subdef for preview print:: Choose subdef for preview - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: Choose subdef for thumbnail print:: Choose subdef for thumbnail - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: add and remember password to protect the pdf @@ -12185,22 +12185,22 @@ print:: download print:: download - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print:: element downloadable print:: element downloadable - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: element printable on preview model print:: element printable on preview model - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: element printable on thumbnail model print:: element printable on thumbnail model - prod/actions/printer_default.html.twig + prod/actions/printer_default.html.twig print:: image de choix et description @@ -12247,90 +12247,100 @@ print:: some options prod/actions/printer_default.html.twig + + print:: warning! Only available image for chosen subdef is printed + print:: warning! Only available image for chosen subdef is printed + prod/actions/printer_default.html.twig + + + print:: warning! Only available media for chosen subdef is downloadable + print:: warning! Only available media for chosen subdef is downloadable + prod/actions/printer_default.html.twig + print_feedback:: Document generated on : print_feedback:: Document generated on : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback active print_feedback:: Feedback active - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback expired print_feedback:: Feedback expired - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback expiring on : print_feedback:: Feedback expiring on : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback initiated by : print_feedback:: Feedback initiated by : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback initiated on : print_feedback:: Feedback initiated on : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Feedback on basket %name% print_feedback:: Feedback on basket %name% - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Non print_feedback:: Non - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Oui print_feedback:: Oui - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Participants : print_feedback:: Participants : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Votes : print_feedback:: Votes : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: base name: print_feedback:: base name: - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: document Uuid: print_feedback:: document Uuid: - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: non voté print_feedback:: non voté - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: originale filename: print_feedback:: originale filename: - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record id: print_feedback:: record id: - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record title: print_feedback:: record title: - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php prive diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index ea287fac01..b7f0ba133d 100644 --- a/resources/locales/validators.de.xlf +++ b/resources/locales/validators.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.en.xlf b/resources/locales/validators.en.xlf index c0dc2ad075..74d248700b 100644 --- a/resources/locales/validators.en.xlf +++ b/resources/locales/validators.en.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.fr.xlf b/resources/locales/validators.fr.xlf index 86ceb91d72..e78be9e277 100644 --- a/resources/locales/validators.fr.xlf +++ b/resources/locales/validators.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.nl.xlf b/resources/locales/validators.nl.xlf index 801aa58b83..f33602996d 100644 --- a/resources/locales/validators.nl.xlf +++ b/resources/locales/validators.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/templates/web/prod/actions/printer_default.html.twig b/templates/web/prod/actions/printer_default.html.twig index a7768e34c9..29df2f27ab 100644 --- a/templates/web/prod/actions/printer_default.html.twig +++ b/templates/web/prod/actions/printer_default.html.twig @@ -71,7 +71,7 @@ -
+
{{ 'print:: warning! Only available image for chosen subdef is printed' | trans }}
@@ -112,8 +112,8 @@ {{ 'print:: Can download subdef' | trans }}