enhanced reading dates

This commit is contained in:
sergeilem
2019-03-05 23:25:31 +03:00
parent ffbdba585f
commit 47f24af084
7 changed files with 49 additions and 10 deletions

10
col.go
View File

@@ -54,7 +54,15 @@ func (xf *XfRk) String(wb *WorkBook) string {
fNo := wb.Xfs[idx].formatNo()
if fNo >= 164 { // user defined format
if formatter := wb.Formats[fNo]; formatter != nil {
if strings.Contains(formatter.str, "#") || strings.Contains(formatter.str, ".00") {
formatterLower := strings.ToLower(formatter.str)
if formatterLower == "general" ||
strings.Contains(formatter.str, "#") ||
strings.Contains(formatter.str, ".00") ||
strings.Contains(formatterLower, "mm/yy") ||
strings.Contains(formatterLower, "dd/yy") ||
strings.Contains(formatterLower, "mm.yy") ||
strings.Contains(formatterLower, "dd.yy") ||
strings.Contains(formatterLower, "дд.гг") {
//If format contains # or .00 then this is a number
return xf.Rk.String()
} else {