updating: adding modifiers for currency, numbers and time

Stinger-Soft · Aug 24, 2020 · 6e577c4 · 6e577c4
1 parent 6e84a39
commit 6e577c4
Show file tree

Hide file tree

Showing 4 changed files with 116 additions and 32 deletions.
diff --git a/src/StingerSoft/ExcelCreator/CellModifier/AbstractModifier.php b/src/StingerSoft/ExcelCreator/CellModifier/AbstractModifier.php
@@ -0,0 +1,51 @@
+<?php
+declare(strict_types=1);
+
+/*
+ * This file is part of the Stinger Excel Creator package.
+ *
+ * (c) Oliver Kotte <oliver.kotte@stinger-soft.net>
+ * (c) Florian Meyer <florian.meyer@stinger-soft.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace StingerSoft\ExcelCreator\CellModifier;
+
+use Box\Spout\Common\Entity\Cell as SpoutCell;
+use Box\Spout\Common\Entity\Style\Style;
+use PhpOffice\PhpSpreadsheet\Cell\Cell as SpreadsheetCell;
+use StingerSoft\ExcelCreator\ColumnBinding;
+
+abstract class AbstractModifier {
+
+	public static function createFormatModifier(string $formatCode, ?string $spoutFormatCode = null): callable {
+		$spoutFormatCode = $spoutFormatCode ?? $formatCode;
+
+		/**
+		 *
+		 * @param ColumnBinding             $binding
+		 * @param SpoutCell|SpreadsheetCell $cell
+		 */
+		return static function (ColumnBinding $binding, $cell) use ($formatCode, $spoutFormatCode) {
+			if($cell instanceof SpoutCell) {
+				$style = $cell->getStyle();
+				if($style === null) {
+					$style = new Style();
+				} else {
+					$style = clone $style;
+					$style->setId(null);
+				}
+				$style->setFormat($spoutFormatCode);
+				$cell->setStyle($style);
+				return;
+			}
+			if($cell instanceof SpreadsheetCell) {
+				$style = $cell->getStyle();
+				$style->applyFromArray(['numberFormat' => ['formatCode' => $formatCode]]);
+				return;
+			}
+		};
+	}
+}
diff --git a/src/StingerSoft/ExcelCreator/CellModifier/CurrencyModifier.php b/src/StingerSoft/ExcelCreator/CellModifier/CurrencyModifier.php
@@ -0,0 +1,25 @@
+<?php
+declare(strict_types=1);
+
+/*
+ * This file is part of the Stinger Excel Creator package.
+ *
+ * (c) Oliver Kotte <oliver.kotte@stinger-soft.net>
+ * (c) Florian Meyer <florian.meyer@stinger-soft.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace StingerSoft\ExcelCreator\CellModifier;
+
+class CurrencyModifier extends AbstractModifier {
+
+	/**
+	 * @return callable
+	 */
+	public static function createCurrencyFormatter(): callable {
+		return self::createFormatModifier('_("$"* #,##0.00_);_("$"* \(#,##0.00\);_("$"* "-"??_);_(@_)', '_("$"* #,##0.00_),_("$"* \(#,##0.00\),_("$"* "-"??_),_(@_)');
+	}
+
+}
diff --git a/src/StingerSoft/ExcelCreator/CellModifier/DateTimeModifier.php b/src/StingerSoft/ExcelCreator/CellModifier/DateTimeModifier.php
@@ -13,13 +13,7 @@
 
 namespace StingerSoft\ExcelCreator\CellModifier;
 
-
-use Box\Spout\Common\Entity\Cell as SpoutCell;
-use Box\Spout\Common\Entity\Style\Style;
-use PhpOffice\PhpSpreadsheet\Cell\Cell as SpreadsheetCell;
-use StingerSoft\ExcelCreator\ColumnBinding;
-
-class DateTimeModifier {
+class DateTimeModifier extends AbstractModifier {
 
 	/**
 	 * @return callable
@@ -29,36 +23,18 @@ public static function createDateModifier(): callable {
 	}
 
 	/**
-	 * @param bool $addSeconds  Note: not working for SPOUT..
+	 * @param bool $addSeconds Note: not working for SPOUT..
 	 * @return callable
 	 */
 	public static function createDateTimeModifier(bool $addSeconds = false): callable {
 		return self::createFormatModifier('m/d/yyyy h:mm' . ($addSeconds ? ':ss' : ''), 'm/d/yy h:mm');
 	}
 
-	public static function createFormatModifier(string $formatCode, ?string $spoutFormatCode = null): callable {
-		$spoutFormatCode = $spoutFormatCode ?? $formatCode;
-
-		/**
-		 *
-		 * @param ColumnBinding $binding
-		 * @param SpoutCell|SpreadsheetCell $cell
-		 */
-		return static function(ColumnBinding $binding, $cell) use ($formatCode, $spoutFormatCode) {
-			if($cell instanceof SpoutCell) {
-				$style = $cell->getStyle();
-				if($style === null) {
-					$style = new Style();
-				}
-				$style->setFormat($spoutFormatCode);
-				$cell->setStyle($style);
-				return;
-			}
-			if($cell instanceof SpreadsheetCell) {
-				$style = $cell->getStyle();
-				$style->applyFromArray(['numberFormat' => ['formatCode' => $formatCode]]);
-				return;
-			}
-		};
+	/**
+	 * @param bool $addSeconds
+	 * @return callable
+	 */
+	public static function createTimeModifier(bool $addSeconds = false): callable {
+		return self::createFormatModifier('h:mm' . ($addSeconds ? ':ss' : ''));
 	}
 }
diff --git a/src/StingerSoft/ExcelCreator/CellModifier/NumberModifier.php b/src/StingerSoft/ExcelCreator/CellModifier/NumberModifier.php
@@ -0,0 +1,32 @@
+<?php
+declare(strict_types=1);
+
+/*
+ * This file is part of the Stinger Excel Creator package.
+ *
+ * (c) Oliver Kotte <oliver.kotte@stinger-soft.net>
+ * (c) Florian Meyer <florian.meyer@stinger-soft.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace StingerSoft\ExcelCreator\CellModifier;
+
+class NumberModifier extends AbstractModifier {
+
+	/**
+	 * @return callable
+	 */
+	public static function createIntFormatter(): callable {
+		return self::createFormatModifier('#,##0');
+	}
+
+	/**
+	 * @return callable
+	 */
+	public static function createFloatFormatter(): callable {
+		return self::createFormatModifier('#,##0.00');
+	}
+
+}