Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HP-2387: refactor DateTimePicker #187

Merged
merged 3 commits into from
Mar 28, 2025
Merged

HP-2387: refactor DateTimePicker #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24610d7
HP-2387: refactor DateTimePicker
tafid Mar 25, 2025
896a9a0
HP-2387: refactor DateTimePicker
tafid Mar 25, 2025
89c3308
HP-2387: refactor DateTimePicker
tafid Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/views/order/_form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<?= $form->field($model, 'time')->widget(DateTimePicker::class, [
'clientOptions' => [
'todayBtn' => true,
'format' => 'yyyy-mm-dd hh:ii', // @see https://github.com/sabinus52/bootstrap-datetimepicker?tab=readme-ov-file
'dateFormat' => 'Y-m-d H:i'
],
]) ?>
</div>
Expand Down
5 changes: 2 additions & 3 deletions src/views/order/_search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
use hipanel\modules\stock\widgets\combo\ContactCombo;
use hipanel\widgets\RefCombo;
use hiqdev\yii2\daterangepicker\DateRangePicker;
use yii\bootstrap\Html;

/**
* @var \hipanel\widgets\AdvancedSearch $search
Expand Down Expand Up @@ -50,13 +49,13 @@

<div class="col-md-4 col-sm-6 col-xs-12">
<div class="form-group">
<?= Html::tag('label', Yii::t('hipanel', 'Time'), ['class' => 'control-label']); ?>
<?= DateRangePicker::widget([
'model' => $search->model,
'attribute' => 'time_from',
'attribute2' => 'time_till',
'options' => [
'class' => 'form-control',
'placeholder' => Yii::t('hipanel', 'Time'),
],
'dateFormat' => 'yyyy-mm-dd',
]) ?>
Comment on lines 60 to 61
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Verify DateRangePicker configuration consistency.

The dateFormat setting appears to be aligned with the DateTimePicker widget changes mentioned in the PR summary. Ensure that this format is consistent with other date-related widgets across the application and that it meets the requirements for displaying and parsing dates correctly.

Also applies to: 76-77

🏁 Script executed:

#!/bin/bash
# Search for other DateRangePicker/DateTimePicker usages to verify consistency
echo "Checking DateRangePicker/DateTimePicker usage patterns across the codebase:"
rg --type php "DateRangePicker::widget\(\[|DateTimePicker::widget\(\[" -A 10 -B 2 | grep -E "dateFormat|format"

Length of output: 698

Action: Resolve Date/Time Format Inconsistency

It appears there’s an inconsistency in how date formats are defined across similar widgets:

  • In src/views/move/_search.php, the widget uses 'dateFormat' => 'yyyy-MM-dd' (note the capital "MM").
  • In src/views/order/_search.php (lines 60–61), the new change sets 'dateFormat' => 'yyyy-mm-dd' (with lowercase "mm").
  • In src/views/part/_search.php, both variations appear—with one instance using the key 'format' and others using 'dateFormat', mixing formats.

Please verify whether the intended standard is to use the uppercase "MM" (commonly used for months) or the lowercase "mm". Then, update all date-related widget configurations to use a consistent format that aligns with both display and parsing requirements.

Expand All @@ -66,13 +65,13 @@
<?php if ($uiModel->representation === 'profit-report'): ?>
<div class="col-md-4 col-sm-6 col-xs-12">
<div class="form-group">
<?= Html::tag('label', Yii::t('hipanel:stock', 'Profit period'), ['class' => 'control-label']); ?>
<?= DateRangePicker::widget([
'model' => $search->model,
'attribute' => 'profit_time_from',
'attribute2' => 'profit_time_till',
'options' => [
'class' => 'form-control',
'placeholder' => Yii::t('hipanel:stock', 'Profit period'),
],
'dateFormat' => 'yyyy-mm-dd',
]) ?>
Expand Down
2 changes: 1 addition & 1 deletion src/views/part/modals/sell-by-plan.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ function setContactFieldByClientName(selectedClientId, selectedClientName) {
],
],
]) ?>
<?= $form->field($model, 'time')->widget(DateTimePicker::class, ['clientOptions' => ['todayBtn' => true]]) ?>
<?= $form->field($model, 'time')->widget(DateTimePicker::class) ?>
<?= $form->field($model, 'reason')->textInput() ?>
</div>
</div>
Expand Down
3 changes: 1 addition & 2 deletions src/views/part/modals/sell.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,7 @@ function setContactFieldByClientName(selectedClientId, selectedClientName) {
<div class="col-md-6">
<?= $form->field($model, 'time')->widget(DateTimePicker::class, [
'clientOptions' => [
'endDate' => date('Y-m-d'),
'todayBtn' => true,
'maxDate' => date('Y-m-d'),
],
]) ?>
</div>
Expand Down
2 changes: 1 addition & 1 deletion tests/playwright/e2e/manager/part/part-create.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import PartView from "@hipanel-module-stock/page/PartView";

function getPartData() {
return {
partno: 'CHASSIS EPYC 7402P',
partno: 'EPYC 7402P',
src_id: 'TEST-DS-01',
dst_id: 'TEST-DS-02',
serials: UniqueId.generate(`MG_TEST_PART`),
Expand Down