From ad82544bc4cc2f930b602d5de644968bc3958774 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Wed, 19 Feb 2025 22:49:26 +0100 Subject: [PATCH] fix changelog issue --- CHANGELOG.md | 7 +++++++ frontend/views/meal/_form.php | 7 +------ frontend/views/meal/index.php | 2 +- frontend/views/meal/update.php | 4 ++-- frontend/views/meal/view.php | 8 ++------ 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bc0eb4..ec3d29d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +* User view text to be more consistant + +### Removed + +* Form fields not needed ## [0.1.0] - 2025-02-10 diff --git a/frontend/views/meal/_form.php b/frontend/views/meal/_form.php index 8fd20c5..12efcae 100644 --- a/frontend/views/meal/_form.php +++ b/frontend/views/meal/_form.php @@ -12,7 +12,7 @@ use yii\widgets\ActiveForm; - field($model, 'file_name')->textInput(['maxlength' => true]) ?> + field($model, 'file_name')->hiddenInput(['maxlength' => true]) ?> field($model, 'calories')->textInput() ?> @@ -24,11 +24,6 @@ use yii\widgets\ActiveForm; field($model, 'fiber')->textInput() ?> - field($model, 'meal')->textInput() ?> - - field($model, 'created_at')->textInput() ?> - - field($model, 'updated_at')->textInput() ?>
'btn btn-success']) ?> diff --git a/frontend/views/meal/index.php b/frontend/views/meal/index.php index 530e533..7f10a42 100644 --- a/frontend/views/meal/index.php +++ b/frontend/views/meal/index.php @@ -17,7 +17,7 @@ $this->params['breadcrumbs'][] = $this->title;

title) ?>

- 'btn btn-success']) ?> + 'btn btn-success']) ?>

diff --git a/frontend/views/meal/update.php b/frontend/views/meal/update.php index e3fbfcd..4566631 100644 --- a/frontend/views/meal/update.php +++ b/frontend/views/meal/update.php @@ -5,9 +5,9 @@ use yii\helpers\Html; /** @var yii\web\View $this */ /** @var common\models\Meal $model */ -$this->title = 'Update Meal: ' . $model->id; +$this->title = 'Update Meal: ' . $model->food_name; $this->params['breadcrumbs'][] = ['label' => 'Meals', 'url' => ['index']]; -$this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]]; +$this->params['breadcrumbs'][] = ['label' => $model->food_name, 'url' => ['view', 'id' => $model->id]]; $this->params['breadcrumbs'][] = 'Update'; ?>
diff --git a/frontend/views/meal/view.php b/frontend/views/meal/view.php index 9cbce54..c71862a 100644 --- a/frontend/views/meal/view.php +++ b/frontend/views/meal/view.php @@ -6,7 +6,7 @@ use yii\widgets\DetailView; /** @var yii\web\View $this */ /** @var common\models\Meal $model */ -$this->title = $model->id; +$this->title = $model->food_name; $this->params['breadcrumbs'][] = ['label' => 'Meals', 'url' => ['index']]; $this->params['breadcrumbs'][] = $this->title; \yii\web\YiiAsset::register($this); @@ -29,16 +29,12 @@ $this->params['breadcrumbs'][] = $this->title; $model, 'attributes' => [ - 'id', - 'file_name', 'calories', 'protein', 'fat', 'carbohydrates', 'fiber', - 'meal', - 'created_at', - 'updated_at', + 'created_at:datetime', ], ]) ?>