animeic 1 рік тому
батько
коміт
e9c3cb2549

+ 5 - 5
boxcost/api/bill-produce-excel.go

@@ -3,7 +3,6 @@ package api
 import (
 	"box-cost/db/model"
 	"fmt"
-	"math"
 
 	"github.com/xuri/excelize/v2"
 )
@@ -342,9 +341,9 @@ func (b *ProduceBillExcel) drawTableContent() error {
 			val2Cel := fmt.Sprintf("%s%d", c, rowIndex)
 			b.Excel.SetCellStyle(b.SheetName, val2Cel, val2Cel, b.AlignCenterStyle)
 
-			var magN float64 = 1
-			lenv := len([]rune(v))
-			magN = math.Ceil(float64(lenv) / 10)
+			// var magN float64 = 1
+			// lenv := len([]rune(v))
+			// magN = math.Ceil(float64(lenv) / 10)
 			// if lenv%10 > 5 {
 			// 	magN = math.Ceil(float64(lenv) / 10)
 
@@ -354,7 +353,8 @@ func (b *ProduceBillExcel) drawTableContent() error {
 			// 		magN = n
 			// 	}
 			// }
-			b.Excel.SetRowHeight(b.SheetName, rowIndex, 21*magN)
+			// b.Excel.SetRowHeight(b.SheetName, rowIndex, 21*magN)
+			b.Excel.SetRowHeight(b.SheetName, rowIndex, 40)
 		}
 	}
 

+ 5 - 5
boxcost/api/bill-product-excel.go

@@ -3,7 +3,6 @@ package api
 import (
 	"box-cost/db/model"
 	"fmt"
-	"math"
 
 	_ "image/gif"
 	_ "image/jpeg"
@@ -174,9 +173,9 @@ func (b *ProductBillExcel) drawTableContent() error {
 			b.Excel.SetCellValue(b.SheetName, fmt.Sprintf("%s%d", c, rowIndex), v)
 			val2Cel := fmt.Sprintf("%s%d", c, rowIndex)
 			b.Excel.SetCellStyle(b.SheetName, val2Cel, val2Cel, b.AlignCenterStyle)
-			var magN float64 = 1
-			lenv := len([]rune(v))
-			magN = math.Ceil(float64(lenv) / 10)
+			// var magN float64 = 1
+			// lenv := len([]rune(v))
+			// magN = math.Ceil(float64(lenv) / 10)
 			// if lenv%10 > 5 {
 			// 	magN = math.Ceil(float64(lenv) / 10)
 
@@ -186,7 +185,8 @@ func (b *ProductBillExcel) drawTableContent() error {
 			// 		magN = n
 			// 	}
 			// }
-			b.Excel.SetRowHeight(b.SheetName, rowIndex, 21*magN)
+			// b.Excel.SetRowHeight(b.SheetName, rowIndex, 21*magN)
+			b.Excel.SetRowHeight(b.SheetName, rowIndex, 40)
 		}
 	}
 	products := b.Content.Products

+ 5 - 5
boxcost/api/bill-purchase-excel.go

@@ -3,7 +3,6 @@ package api
 import (
 	"box-cost/db/model"
 	"fmt"
-	"math"
 
 	_ "image/gif"
 	_ "image/jpeg"
@@ -219,9 +218,9 @@ func (b *PurchaseBillExcel) drawTableContent() error {
 			b.Excel.SetCellValue(b.SheetName, fmt.Sprintf("%s%d", c, rowIndex), v)
 			val2Cel := fmt.Sprintf("%s%d", c, rowIndex)
 			b.Excel.SetCellStyle(b.SheetName, val2Cel, val2Cel, b.AlignCenterStyle)
-			var magN float64 = 1
-			lenv := len([]rune(v))
-			magN = math.Ceil(float64(lenv) / 10)
+			// var magN float64 = 1
+			// lenv := len([]rune(v))
+			// magN = math.Ceil(float64(lenv) / 10)
 			// if lenv%10 > 5 {
 			// 	magN = math.Ceil(float64(lenv) / 10)
 
@@ -231,7 +230,8 @@ func (b *PurchaseBillExcel) drawTableContent() error {
 			// 		magN = n
 			// 	}
 			// }
-			b.Excel.SetRowHeight(b.SheetName, rowIndex, 21*magN)
+			// b.Excel.SetRowHeight(b.SheetName, rowIndex, 21*magN)
+			b.Excel.SetRowHeight(b.SheetName, rowIndex, 40)
 
 		}
 	}

+ 6 - 6
boxcost/api/report-produce-excel.go

@@ -3,7 +3,6 @@ package api
 import (
 	"box-cost/db/model"
 	"fmt"
-	"math"
 
 	"github.com/xuri/excelize/v2"
 )
@@ -351,10 +350,11 @@ func (b *ReportProduceExcel) drawTableContent() error {
 			val2Cel := fmt.Sprintf("%s%d", c, rowIndex)
 			b.Excel.SetCellStyle(b.SheetName, val2Cel, val2Cel, b.AlignCenterStyle)
 
-			var magN float64 = 1
-			lenv := len([]rune(v))
-			magN = math.Ceil(float64(lenv) / 10)
-			b.Excel.SetRowHeight(b.SheetName, rowIndex, 21*magN)
+			// var magN float64 = 1
+			// lenv := len([]rune(v))
+			// magN = math.Ceil(float64(lenv) / 10)
+			// b.Excel.SetRowHeight(b.SheetName, rowIndex, 21*magN)
+			b.Excel.SetRowHeight(b.SheetName, rowIndex, 40)
 		}
 	}
 
@@ -418,7 +418,7 @@ func NewReportProduceExcel(f *excelize.File) *ReportProduceExcel {
 	}
 
 	styleLeft, _ := f.NewStyle(&excelize.Style{
-		Alignment: &excelize.Alignment{Horizontal: "center", Vertical: "center"},
+		Alignment: &excelize.Alignment{Horizontal: "center", Vertical: "center", WrapText: true},
 		Border:    border,
 	})
 

+ 6 - 6
boxcost/api/report-product-excel.go

@@ -3,7 +3,6 @@ package api
 import (
 	"box-cost/db/model"
 	"fmt"
-	"math"
 	"regexp"
 
 	_ "image/gif"
@@ -170,10 +169,11 @@ func (b *ReportProductExcel) drawTableContent() error {
 			val2Cel := fmt.Sprintf("%s%d", c, rowIndex)
 			b.Excel.SetCellStyle(b.SheetName, val2Cel, val2Cel, b.AlignCenterStyle)
 
-			var magN float64 = 1
-			lenv := len([]rune(v))
-			magN = math.Ceil(float64(lenv) / 10)
-			b.Excel.SetRowHeight(b.SheetName, rowIndex, 21*magN)
+			// var magN float64 = 1
+			// lenv := len([]rune(v))
+			// magN = math.Ceil(float64(lenv) / 10)
+			// b.Excel.SetRowHeight(b.SheetName, rowIndex, 21*magN)
+			b.Excel.SetRowHeight(b.SheetName, rowIndex, 40)
 		}
 	}
 
@@ -301,7 +301,7 @@ func NewReportProductBill(f *excelize.File) *ReportProductExcel {
 	}
 
 	styleLeft, _ := f.NewStyle(&excelize.Style{
-		Alignment: &excelize.Alignment{Horizontal: "center", Vertical: "center"},
+		Alignment: &excelize.Alignment{Horizontal: "center", Vertical: "center", WrapText: true},
 		Border:    border,
 		Font:      &excelize.Font{Size: 10},
 	})

+ 6 - 6
boxcost/api/report-purchase-excel.go

@@ -3,7 +3,6 @@ package api
 import (
 	"box-cost/db/model"
 	"fmt"
-	"math"
 
 	_ "image/gif"
 	_ "image/jpeg"
@@ -225,10 +224,11 @@ func (b *ReportPurchaseExcel) drawTableContent() error {
 			val2Cel := fmt.Sprintf("%s%d", c, rowIndex)
 			b.Excel.SetCellStyle(b.SheetName, val2Cel, val2Cel, b.AlignCenterStyle)
 
-			var magN float64 = 1
-			lenv := len([]rune(v))
-			magN = math.Ceil(float64(lenv) / 10)
-			b.Excel.SetRowHeight(b.SheetName, rowIndex, 21*magN)
+			// var magN float64 = 1
+			// lenv := len([]rune(v))
+			// magN = math.Ceil(float64(lenv) / 10)
+			// b.Excel.SetRowHeight(b.SheetName, rowIndex, 21*magN)
+			b.Excel.SetRowHeight(b.SheetName, rowIndex, 40)
 		}
 	}
 
@@ -282,7 +282,7 @@ func NewReportPurchaseExcel(f *excelize.File) *ReportPurchaseExcel {
 	}
 
 	styleLeft, _ := f.NewStyle(&excelize.Style{
-		Alignment: &excelize.Alignment{Horizontal: "center", Vertical: "center"},
+		Alignment: &excelize.Alignment{Horizontal: "center", Vertical: "center", WrapText: true},
 		Border:    border,
 		Font:      &excelize.Font{Size: 10},
 	})