Enhanced to read and write formatted dates and formulas. #48

HarshaM0211 · 2023-10-02T09:46:54Z

Modified entire XlsxReader.java file:
Replaced HSSF in XlsReader.java with XSSF everywhere and did the same logics.

Created two new methods "getFormats()" and "getFormulaCols" to store data about the columns that have to be date formatted and containing formulas.

Modified @SheetColumn

Added files and some modified data for Test cases.

VyshnaviRG · 2023-10-03T06:15:38Z

src/main/java/io/github/millij/poi/ss/model/annotations/SheetColumn.java

+    boolean isFormatted() default false;
+    String format() default "dd/MM/yyyy";
+
+    boolean isFromula() default false;


Correct formula spelling

VyshnaviRG · 2023-10-03T06:18:45Z

src/main/java/io/github/millij/poi/ss/reader/XlsReader.java

+                	if (DateUtil.isCellDateFormatted(cell)) {
+
+    					Map<String, String> formats = SpreadsheetWriter.getFormats(beanClz);
+    					String cellFormat = formats.get(cellColName);


VyshnaviRG · 2023-10-03T06:24:07Z

src/main/java/io/github/millij/poi/ss/reader/XlsReader.java

+    					} else {
+    						formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy");
+    					}
+


store default format as const..

Also, Can be written as
final String format = cellFormat != null ? cellFormat : defaultFormat; DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);

VyshnaviRG · 2023-10-03T06:25:12Z

src/main/java/io/github/millij/poi/ss/reader/XlsxReader_ftDate.java

@@ -0,0 +1,263 @@
+package io.github.millij.poi.ss.reader;


Any reason for filename change ??

VyshnaviRG · 2023-10-03T06:25:29Z

src/main/java/io/github/millij/poi/ss/reader/XlsxReader_ftDate.java

+    @Override
+    public <T> void read(Class<T> beanClz, InputStream is, int sheetNo, RowListener<T> listener)
+    	throws SpreadsheetReadException {
+    // Sanity checks


Format code

… to cmnts

VyshnaviRG · 2023-10-04T08:34:07Z

src/main/java/io/github/millij/poi/ss/reader/XlsxReader_ftDate.java

+import org.apache.poi.ss.usermodel.DateUtil;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Workbook;
+// import org.apache.poi.util.SAXHelper;


Remove the comment

VyshnaviRG · 2023-10-04T08:38:12Z

src/test/java/io/github/millij/dates/DateTest.java

+// import io.github.millij.bean.Schedules;
+import io.github.millij.poi.ss.writer.SpreadsheetWriter;
+
+// import io.github.millij.bean.Schedules;


Remove Commented imports

VyshnaviRG · 2023-10-04T08:40:25Z

src/main/java/io/github/millij/poi/util/Spreadsheet.java

-                mapping.put(fieldName, ec.value());
+
+            if (ec != null) {
+                String value = StringUtils.isNotEmpty(ec.value()) ? ec.value() : fieldName;


VyshnaviRG · 2023-10-04T08:45:32Z

src/main/java/io/github/millij/poi/ss/writer/SpreadsheetWriter.java

@@ -119,12 +126,45 @@ public <EB> void addSheet(Class<EB> beanType, List<EB> rowObjects, List<String>
            for (int i = 0, rowNum = 1; i < rowObjects.size(); i++, rowNum++) {
                final XSSFRow row = sheet.createRow(rowNum);

+                final Map<String, String> dateFormatsMap = this.getFormats(beanType);


Move outside of for loop

VyshnaviRG · 2023-10-04T08:46:05Z

src/main/java/io/github/millij/poi/ss/writer/SpreadsheetWriter.java

+                            cellNo++;
+
+                        } catch (Exception e) {
+                            e.printStackTrace();


Use LOGGER to display exceptions

…heets--issue 24

… prev. sheets--issue 24" This reverts commit 78995e4. reverting updates

Rupesh8844 · 2023-10-09T10:48:20Z

src/main/java/io/github/millij/poi/util/Spreadsheet.java

@@ -56,28 +58,28 @@ public static Map<String, String> getPropertyToColumnNameMap(Class<?> beanType)
        final Map<String, String> mapping = new HashMap<String, String>();

        // Fields
-        Field[] fields = beanType.getDeclaredFields();
+        final Field[] fields = beanType.getDeclaredFields();
        for (Field f : fields) {
            String fieldName = f.getName();


[PP] make the string final.

Rupesh8844 · 2023-10-09T11:03:34Z

src/test/java/io/github/millij/dates/DateTest.java

+    @Test
+    public void writeDatesTest() throws IOException {
+
+        List<Schedule> schedules = new ArrayList<Schedule>();


…from develop branch

Harsha0211 added 2 commits October 2, 2023 14:58

Enhanced to read and write formatted dates and formulas.

92a2ea6

Issue-27 fix

9327ba4

VyshnaviRG reviewed Oct 3, 2023

View reviewed changes

Harsha0211 added 2 commits October 3, 2023 12:04

minor variable name change

bfdb650

Enhanced to read and write formatted dates and formulas-modified acc.…

1a44805

… to cmnts

VyshnaviRG reviewed Oct 4, 2023

View reviewed changes

Harsha0211 added 4 commits October 4, 2023 15:03

minor code refactor

41ff52e

executed DateTest.java->sample-files changed

00efbc6

Enhanced to write new sheet to existing file without clearing prev. s…

78995e4

…heets--issue 24

Revert "Enhanced to write new sheet to existing file without clearing…

8944d87

… prev. sheets--issue 24" This reverts commit 78995e4. reverting updates

Rupesh8844 reviewed Oct 9, 2023

View reviewed changes

Harsha0211 added 8 commits October 10, 2023 13:53

[TestCase Update] updated test cases with Date format checks

ee9b2bf

[SheetColumn] removed 'isFormated' field from sheet column

114501c

[DateFormat] added support for localDate and Date

1d48dce

[RMVD-Formula part] Removed all the formula related code

6cd9cbb

[Final keyword] Added final keyword at necessary lines

b45ad03

[LocalDate read] Modified code to support LocalDate

fdfb8a5

[Test Cases] Added and modified files for Dates TestCases

0819f0b

[Finla keyword]Added final keyword at necessary lines

6037107

HarshaM0211 closed this Oct 11, 2023

[Unused imports] Removed unused imports

fba7611

HarshaM0211 reopened this Oct 11, 2023

Harsha0211 added 4 commits October 11, 2023 10:46

[Revert] reverted sheet and rowListeners file from develop branch

851936e

[Code refactor] Replaced SheetColumn,SSReader,Beans,XlsxReader files …

2e44848

…from develop branch

[Code Refactor] Added minor changes to replaced files in prev commit

5f44494

[Final] Added final keyword

d59ac27

This was referenced Oct 12, 2023

For Issue#22 Read multiple columns with same header #54

Open

For issue#35 - Read sheet by name #55

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enhanced to read and write formatted dates and formulas. #48

Enhanced to read and write formatted dates and formulas. #48

HarshaM0211 commented Oct 2, 2023

VyshnaviRG Oct 3, 2023

VyshnaviRG Oct 3, 2023

VyshnaviRG Oct 3, 2023

VyshnaviRG Oct 3, 2023

VyshnaviRG Oct 3, 2023

VyshnaviRG Oct 4, 2023

VyshnaviRG Oct 4, 2023

VyshnaviRG Oct 4, 2023

VyshnaviRG Oct 4, 2023

VyshnaviRG Oct 4, 2023 •

edited

Loading

Rupesh8844 Oct 9, 2023

Rupesh8844 Oct 9, 2023

Enhanced to read and write formatted dates and formulas. #48

Are you sure you want to change the base?

Enhanced to read and write formatted dates and formulas. #48

Conversation

HarshaM0211 commented Oct 2, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

VyshnaviRG Oct 4, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

VyshnaviRG Oct 4, 2023 •

edited

Loading