Просмотр исходного кода

Reporting zu 100% abgeschlossen!

Arne Diekmann 8 лет назад
Родитель
Сommit
4af8125c34

+ 18 - 15
GreenTree.Nachtragsmanagement.Web/Controllers/AppendixController.cs

@@ -111,7 +111,7 @@ namespace GreenTree.Nachtragsmanagement.Web.Controllers
         /// Export result for appendix grid
         /// Export result for appendix grid
         /// </summary>
         /// </summary>
         [HttpPost]
         [HttpPost]
-        public ActionResult ExportPartialAppendices(string displayMode, string exportformat)
+        public ActionResult ExportPartialAppendices(string displayMode, string exportformat, string exportType)
         {
         {
             if (String.IsNullOrEmpty(displayMode))
             if (String.IsNullOrEmpty(displayMode))
                 return new EmptyResult();
                 return new EmptyResult();
@@ -149,21 +149,24 @@ namespace GreenTree.Nachtragsmanagement.Web.Controllers
                         new PrintGridModel(report, "Appendix", "ExportPartialAppendices", "devGridViewAppendix"));
                         new PrintGridModel(report, "Appendix", "ExportPartialAppendices", "devGridViewAppendix"));
                 else if (displayMode == "export")
                 else if (displayMode == "export")
                 {
                 {
-                    switch (exportformat.ToLower())
+                    if (exportType != "print")
                     {
                     {
-                        case "xlsx":
-                            settings.TotalSummary["OfferingValue"].DisplayFormat = "{0:c2}";
-                            settings.TotalSummary["NegotiationValue"].DisplayFormat = "{0:c2}";
-                            settings.TotalSummary["Description"].DisplayFormat = "Anzahl = {0:n0}";
-                            return GridViewExtension.ExportToXlsx(settings, appendixModels);
-                        case "xls":
-                            settings.TotalSummary["OfferingValue"].DisplayFormat = "{0:c2}";
-                            settings.TotalSummary["NegotiationValue"].DisplayFormat = "{0:c2}";
-                            settings.TotalSummary["Description"].DisplayFormat = "Anzahl = {0:n0}";
-                            return GridViewExtension.ExportToXls(settings, appendixModels);
-                        case "pdf":
-                            generator.WritePdfToResponse(Response, "Nachtragsliste.pdf", DispositionTypeNames.Attachment.ToString());
-                            break;
+                        switch (exportformat.ToLower())
+                        {
+                            case "xlsx":
+                                settings.TotalSummary["OfferingValue"].DisplayFormat = "{0:c2}";
+                                settings.TotalSummary["NegotiationValue"].DisplayFormat = "{0:c2}";
+                                settings.TotalSummary["Description"].DisplayFormat = "Anzahl = {0:n0}";
+                                return GridViewExtension.ExportToXlsx(settings, appendixModels);
+                            case "xls":
+                                settings.TotalSummary["OfferingValue"].DisplayFormat = "{0:c2}";
+                                settings.TotalSummary["NegotiationValue"].DisplayFormat = "{0:c2}";
+                                settings.TotalSummary["Description"].DisplayFormat = "Anzahl = {0:n0}";
+                                return GridViewExtension.ExportToXls(settings, appendixModels);
+                            case "pdf":
+                                generator.WritePdfToResponse(Response, "Nachtragsliste.pdf", DispositionTypeNames.Attachment.ToString());
+                                break;
+                        }
                     }
                     }
                 }
                 }
 
 

+ 21 - 18
GreenTree.Nachtragsmanagement.Web/Controllers/DeviationController.cs

@@ -111,7 +111,7 @@ namespace GreenTree.Nachtragsmanagement.Web.Controllers
         /// Export result for deviation grid
         /// Export result for deviation grid
         /// </summary>
         /// </summary>
         [HttpPost]
         [HttpPost]
-        public ActionResult ExportPartialDeviations(string displayMode, string exportformat)
+        public ActionResult ExportPartialDeviations(string displayMode, string exportformat, string exportType)
         {
         {
             if (String.IsNullOrEmpty(displayMode))
             if (String.IsNullOrEmpty(displayMode))
                 return new EmptyResult();
                 return new EmptyResult();
@@ -149,24 +149,27 @@ namespace GreenTree.Nachtragsmanagement.Web.Controllers
                         new PrintGridModel(report, "Deviation", "ExportPartialDeviations", "devGridViewDeviation"));
                         new PrintGridModel(report, "Deviation", "ExportPartialDeviations", "devGridViewDeviation"));
                 else if (displayMode == "export")
                 else if (displayMode == "export")
                 {
                 {
-                    switch (exportformat.ToLower())
+                    if (exportType != "print")
                     {
                     {
-                        case "xlsx":
-                            settings.TotalSummary["Value"].DisplayFormat = "{0:c2}";
-                            settings.TotalSummary["Percentage"].DisplayFormat = "{0:p0}";
-                            settings.TotalSummary["PercentageValue"].DisplayFormat = "{0:c2}";
-                            settings.TotalSummary["DaysReceiptToAppendixOffering"].DisplayFormat = "Schnitt = {0:n0}";
-                            settings.TotalSummary["Description"].DisplayFormat = "Anzahl = {0:n0}";
-                            return GridViewExtension.ExportToXlsx(settings, deviationModels);
-                        case "xls":
-                            settings.TotalSummary["Value"].DisplayFormat = "{0:c2}";
-                            settings.TotalSummary["Percentage"].DisplayFormat = "{0:p0}";
-                            settings.TotalSummary["DaysReceiptToAppendixOffering"].DisplayFormat = "Schnitt = {0:n0}";
-                            settings.TotalSummary["Description"].DisplayFormat = "Anzahl = {0:n0}";
-                            return GridViewExtension.ExportToXls(settings, deviationModels);
-                        case "pdf":
-                            generator.WritePdfToResponse(Response, "VA-Liste.pdf", DispositionTypeNames.Attachment.ToString());
-                            break;
+                        switch (exportformat.ToLower())
+                        {
+                            case "xlsx":
+                                settings.TotalSummary["Value"].DisplayFormat = "{0:c2}";
+                                settings.TotalSummary["Percentage"].DisplayFormat = "{0:p0}";
+                                settings.TotalSummary["PercentageValue"].DisplayFormat = "{0:c2}";
+                                settings.TotalSummary["DaysReceiptToAppendixOffering"].DisplayFormat = "Schnitt = {0:n0}";
+                                settings.TotalSummary["Description"].DisplayFormat = "Anzahl = {0:n0}";
+                                return GridViewExtension.ExportToXlsx(settings, deviationModels);
+                            case "xls":
+                                settings.TotalSummary["Value"].DisplayFormat = "{0:c2}";
+                                settings.TotalSummary["Percentage"].DisplayFormat = "{0:p0}";
+                                settings.TotalSummary["DaysReceiptToAppendixOffering"].DisplayFormat = "Schnitt = {0:n0}";
+                                settings.TotalSummary["Description"].DisplayFormat = "Anzahl = {0:n0}";
+                                return GridViewExtension.ExportToXls(settings, deviationModels);
+                            case "pdf":
+                                generator.WritePdfToResponse(Response, "VA-Liste.pdf", DispositionTypeNames.Attachment.ToString());
+                                break;
+                        }
                     }
                     }
                 }
                 }
 
 

+ 12 - 9
GreenTree.Nachtragsmanagement.Web/Controllers/MiscController.cs

@@ -356,7 +356,7 @@ namespace GreenTree.Nachtragsmanagement.Web.Controllers
         /// Export result for misc grid
         /// Export result for misc grid
         /// </summary>
         /// </summary>
         [HttpPost]
         [HttpPost]
-        public ActionResult ExportPartialLogs(string displayMode, string exportformat)
+        public ActionResult ExportPartialLogs(string displayMode, string exportformat, string exportType)
         {
         {
             if (String.IsNullOrEmpty(displayMode))
             if (String.IsNullOrEmpty(displayMode))
                 return new EmptyResult();
                 return new EmptyResult();
@@ -392,15 +392,18 @@ namespace GreenTree.Nachtragsmanagement.Web.Controllers
                         new PrintGridModel(report, "Misc", "ExportPartialLogs", "devGridViewLog"));
                         new PrintGridModel(report, "Misc", "ExportPartialLogs", "devGridViewLog"));
                 else if (displayMode == "export")
                 else if (displayMode == "export")
                 {
                 {
-                    switch (exportformat.ToLower())
+                    if (exportType != "print")
                     {
                     {
-                        case "xlsx":
-                            return GridViewExtension.ExportToXlsx(settings, logModels);
-                        case "xls":
-                            return GridViewExtension.ExportToXls(settings, logModels);
-                        case "pdf":
-                            generator.WritePdfToResponse(Response, "Logliste.pdf", DispositionTypeNames.Attachment.ToString());
-                            break;
+                        switch (exportformat.ToLower())
+                        {
+                            case "xlsx":
+                                return GridViewExtension.ExportToXlsx(settings, logModels);
+                            case "xls":
+                                return GridViewExtension.ExportToXls(settings, logModels);
+                            case "pdf":
+                                generator.WritePdfToResponse(Response, "Logliste.pdf", DispositionTypeNames.Attachment.ToString());
+                                break;
+                        }
                     }
                     }
                 }
                 }