move file

Controllers/KPI.Controller.cs

@@ -176,6 +176,11 @@ namespace rmutr_report.Controllers
                         
                         foreach (var data1 in header.data)
                         {
+                            if ( rowno > 1 )
+                            {
+                               ws.Range(ws.Cell(row, 1), ws.Cell(row,1)).Merge();
+
+                            }
                             ws.Cell(row, 2).Value = rowno;
                             ws.Cell(row, 3).Value = data1.name;
                             ws.Cell(row, 4).Value = data1.unit;

Controllers/Summary.Controller.cs

@@ -275,19 +275,27 @@ namespace rmutr_report.Controllers
                     stream.Seek(0, SeekOrigin.Begin);
                     return File(stream, "text/csv");
                     break;
+                case "xlsx": case "xls":
+                    workbook.SaveAs(stream);
+                    var content = stream.ToArray();
+                    string date = DateTime.Now.ToString("yyyyMMddHHmmss");
+                    return File(
+                        content,
+                        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                        "equipments_" + date + ".xlsx");
             }
-
+           
-            using (var stream1 = new MemoryStream())
+            // using (var stream1 = new MemoryStream())
-            {
+            // {
-                workbook.SaveAs(stream1);
+            //     workbook.SaveAs(stream1);
-                var content = stream1.ToArray();
+            //     var content = stream1.ToArray();
-                string date = DateTime.Now.ToString("yyyyMMddHHmmss");
+            //     string date = DateTime.Now.ToString("yyyyMMddHHmmss");
-                return File(
+            //     return File(
-                    content,
+            //         content,
-                    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+            //         "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-                    "equipments_" + date + ".xlsx");
+            //         "equipments_" + date + ".xlsx");
-            }
+            // }
-            // return Ok();
+             return Ok();
         
     }
 

rmutr-report.csproj

@@ -16,5 +16,8 @@
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.0.7" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Models\budget" />
+  </ItemGroup>
 
 </Project>