FIX Import of date with type field from excel files does not work.
This commit is contained in:
parent
2db22206ec
commit
d9962e22ee
1 changed files with 16 additions and 3 deletions
|
|
@ -30,6 +30,7 @@
|
|||
use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PhpOffice\PhpSpreadsheet\Style\Alignment;
|
||||
use PhpOffice\PhpSpreadsheet\Shared\Date;
|
||||
|
||||
require_once DOL_DOCUMENT_ROOT . '/core/modules/import/modules_import.php';
|
||||
|
||||
|
|
@ -302,22 +303,34 @@ class ImportXlsx extends ModeleImports
|
|||
public function import_read_record()
|
||||
{
|
||||
// phpcs:enable
|
||||
global $conf;
|
||||
|
||||
$rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
|
||||
if ($this->record > $rowcount) {
|
||||
return false;
|
||||
}
|
||||
$array = array();
|
||||
|
||||
$xlsx = new Xlsx();
|
||||
$info = $xlsx->listWorksheetinfo($this->file);
|
||||
$countcolumns = $info[0]['totalColumns'];
|
||||
|
||||
for ($col = 1; $col <= $countcolumns; $col++) {
|
||||
$val = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, $this->record)->getValue();
|
||||
$tmpcell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, $this->record);
|
||||
|
||||
$val = $tmpcell->getValue();
|
||||
|
||||
if (Date::isDateTime($tmpcell)) {
|
||||
// For date field, we use the standard date format string.
|
||||
$dateValue = Date::excelToDateTimeObject($val);
|
||||
$val = $dateValue->format('Y-m-d H:i:s');
|
||||
}
|
||||
|
||||
$array[$col]['val'] = $val;
|
||||
$array[$col]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we consider it null
|
||||
}
|
||||
$this->record++;
|
||||
|
||||
unset($xlsx);
|
||||
|
||||
return $array;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue