MahmoudEmad/herolib
1
0
Fork 0
Code Issues 55 Pull Requests 1 Actions Packages Projects Releases 26 Wiki Activity

fix sheet processing issues

Browse Source
This commit is contained in:
timurgordon
2025-02-18 05:07:56 +03:00
parent 54024ee222
commit b92647c52e
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/biz/spreadsheet/row.v
View File

@@ -95,7 +95,7 @@ pub fn (mut r Row) cell_get(colnr int) !&Cell {
return &r.cells[colnr]
}
pub fn (mut r Row) values_get() []f64 {
pub fn (r Row) values_get() []f64 {
mut out := []f64{}
for cell in r.cells {
out << cell.val

8
lib/biz/spreadsheet/sheet.v
View File

@@ -259,13 +259,13 @@ pub fn (mut s Sheet) json() string {
}
// find row, report error if not found
pub fn (mut s Sheet) row_get(name string) !&Row {
mut row := s.rows[name] or { return error('could not find row with name: ${name}') }
pub fn (s Sheet) row_get(name string) !&Row {
row := s.rows[name] or { return error('could not find row with name: ${name}, available rows: ${s.rows.keys()}') }
return row
}
pub fn (mut s Sheet) values_get(name string) ![]f64 {
mut r := s.row_get(name)!
pub fn (s Sheet) values_get(name string) ![]f64 {
r := s.row_get(name)!
vs := r.values_get()
return vs
}

10
lib/biz/spreadsheet/sheet_getters.v
View File

@@ -121,7 +121,7 @@ pub fn (mut s Sheet) data_get_as_string(args RowGetArgs) !string {
mut s2 := s
if args.period_type == .year {
s.toyear(
s2 = s.toyear(
name: args.rowname
namefilter: args.namefilter
includefilter: args.includefilter
@@ -129,7 +129,7 @@ pub fn (mut s Sheet) data_get_as_string(args RowGetArgs) !string {
)!
}
if args.period_type == .quarter {
s.toquarter(
s2 = s.toquarter(
name: args.rowname
namefilter: args.namefilter
includefilter: args.includefilter
@@ -141,13 +141,13 @@ pub fn (mut s Sheet) data_get_as_string(args RowGetArgs) !string {
// console.print_debug(s2.row_get(args.rowname)!)
mut vals := s2.values_get(args.rowname)!
if args.period_type == .year && vals.len != nryears {
return error('${err_pre}Vals.len need to be 6, for year.\nhere:\n${vals}')
return error('${err_pre}Vals.len need to be ${nryears}, for year.\nhere:\n${vals}')
}
if args.period_type == .quarter && vals.len != nryears * 4 {
return error('${err_pre}vals.len need to be 6*4, for quarter.\nhere:\n${vals}')
return error('${err_pre}vals.len need to be ${nryears}*4, for quarter.\nhere:\n${vals}')
}
if args.period_type == .month && vals.len != nryears * 12 {
return error('${err_pre}vals.len need to be 6*12, for month.\nhere:\n${vals}')
return error('${err_pre}vals.len need to be ${nryears}*12, for month.\nhere:\n${vals}')
}
for mut val in vals {