diff --git a/server/AyaNova/biz/ReportBiz.cs b/server/AyaNova/biz/ReportBiz.cs index 633b5743..89558186 100644 --- a/server/AyaNova/biz/ReportBiz.cs +++ b/server/AyaNova/biz/ReportBiz.cs @@ -185,9 +185,7 @@ namespace AyaNova.Biz Report dbObject = await ct.Report.SingleOrDefaultAsync(z => z.Id == id); ValidateCanDelete(dbObject); if (HasErrors) - return false; - if (HasErrors) - return false; + return false; ct.Report.Remove(dbObject); await ct.SaveChangesAsync(); await EventLogProcessor.DeleteObjectLogAsync(UserId, BizType, dbObject.Id, dbObject.Name, ct); diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index f3c27e62..471881b5 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -727,6 +727,19 @@ "RegionWOStatusChanged": "WO status changed", "ReportActive": "Aktiv", "ReportDesignReport": "Bericht bearbeiten", + "ReportPdfOptions":"PDF options", + "ReportDisplayHeaderFooter":"Display header & footer", + "ReportHeaderTemplate":"Header template", + "ReportFooterTemplate":"Footer template", + "ReportPaperFormat":"Paper format", + "ReportLandscape":"Landscape", + "ReportMarginOptionsBottom":"Bottom margin", + "ReportMarginOptionsLeft":"Left margin", + "ReportMarginOptionsRight":"Right margin", + "ReportMarginOptionsTop":"Top margin", + "ReportPrintBackground":"Print background", + "ReportScale":"Scale", + "ReportPreferCSSPageSize":"Prefer CSS page size", "ReportImportDuplicate": "Ausgewählter Bericht kann nicht importiert werden: In Ihrer Datenbank ist bereits ein Bericht mit der gleichen internen ID vorhanden", "ReportExport": "Exportieren nach ...", "ReportExportHTML": "HTML-Datei (*.html)", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 1961f810..8cc5dd96 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -727,6 +727,19 @@ "RegionWOStatusChanged": "WO status changed", "ReportActive": "Active", "ReportDesignReport": "Edit report", + "ReportPdfOptions":"PDF options", + "ReportDisplayHeaderFooter":"Display header & footer", + "ReportHeaderTemplate":"Header template", + "ReportFooterTemplate":"Footer template", + "ReportPaperFormat":"Paper format", + "ReportLandscape":"Landscape", + "ReportMarginOptionsBottom":"Bottom margin", + "ReportMarginOptionsLeft":"Left margin", + "ReportMarginOptionsRight":"Right margin", + "ReportMarginOptionsTop":"Top margin", + "ReportPrintBackground":"Print background", + "ReportScale":"Scale", + "ReportPreferCSSPageSize":"Prefer CSS page size", "ReportImportDuplicate": "Selected report can not be imported: There is already a report with the same internal ID value in your database", "ReportExport": "Export to...", "ReportExportHTML": "HTML file (*.html)", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index 9cf4cc61..86f89c47 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -726,6 +726,19 @@ "RegionWOStatusChanged": "WO status changed", "ReportActive": "Activo", "ReportDesignReport": "Editar informe", + "ReportPdfOptions":"PDF options", + "ReportDisplayHeaderFooter":"Display header & footer", + "ReportHeaderTemplate":"Header template", + "ReportFooterTemplate":"Footer template", + "ReportPaperFormat":"Paper format", + "ReportLandscape":"Landscape", + "ReportMarginOptionsBottom":"Bottom margin", + "ReportMarginOptionsLeft":"Left margin", + "ReportMarginOptionsRight":"Right margin", + "ReportMarginOptionsTop":"Top margin", + "ReportPrintBackground":"Print background", + "ReportScale":"Scale", + "ReportPreferCSSPageSize":"Prefer CSS page size", "ReportImportDuplicate": "El informe seleccionado no puede importarse: Ya existe un informe con el mismo valor de identificación interna en la base de datos", "ReportExport": "Exportar a...", "ReportExportHTML": "Archivo HTML (*.html)", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 6bd5af1b..64b69436 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -727,6 +727,19 @@ "RegionWOStatusChanged": "WO status changed", "ReportActive": "Actif", "ReportDesignReport": "Modifier le rapport", + "ReportPdfOptions":"Options PDF", + "ReportDisplayHeaderFooter":"Afficher l'en-tête et le pied de page", + "ReportHeaderTemplate":"Modèle d'en-tête", + "ReportFooterTemplate":"Modèle de pied de page", + "ReportPaperFormat":"Format papier", + "ReportLandscape":"Paysage", + "ReportMarginOptionsBottom":"Marge inférieure", + "ReportMarginOptionsLeft":"Marge de gauche", + "ReportMarginOptionsRight":"Marge droite", + "ReportMarginOptionsTop":"Marge supérieure", + "ReportPrintBackground":"Imprimer l'arrière-plan", + "ReportScale":"Échelle", + "ReportPreferCSSPageSize":"Préférez la taille de la page CSS", "ReportImportDuplicate": "Impossible d'importer le rapport sélectionné : votre base de données contient déjà un rapport portant cet ID interne", "ReportExport": "Exporter vers...", "ReportExportHTML": "Fichier HTML (*.html)", diff --git a/server/AyaNova/resource/rpt/stock-report-templates/EXAMPLE PDF Options page number.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/EXAMPLE PDF Options page number.ayrt new file mode 100644 index 00000000..8c080817 --- /dev/null +++ b/server/AyaNova/resource/rpt/stock-report-templates/EXAMPLE PDF Options page number.ayrt @@ -0,0 +1 @@ +{"Name":"EXAMPLE PDF Options page number","Active":true,"Notes":"","Roles":124927,"ObjectType":2,"Template":"\n\n\n\t{{#each ayReportData}}\n\t

{{ Name }}

\n\t
Notes: {{ Notes }}
\n\t{{/each}}\n\n\n","Style":"","JsPrerender":"","JsHelpers":"","RenderType":0,"HeaderTemplate":"  Header: Page  of ","FooterTemplate":"  Footer: Page  of ","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"40px","MarginOptionsLeft":"40px","MarginOptionsRight":"40px","MarginOptionsTop":"40px","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.0000} \ No newline at end of file