From 274398800a6d5465c96e30eb04ef829b7e690b96 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Mon, 22 Jan 2024 14:13:25 +0800
Subject: [PATCH] * Fix bug #44561.

---
 module/productplan/js/common.ui.js    | 8 ++++----
 module/productplan/js/create.ui.js    | 2 +-
 module/productplan/ui/create.html.php | 7 +++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/module/productplan/js/common.ui.js b/module/productplan/js/common.ui.js
index 9e5d1f15ab..0aff3729d8 100644
--- a/module/productplan/js/common.ui.js
+++ b/module/productplan/js/common.ui.js
@@ -6,9 +6,9 @@
  */
 function computeEndDate(e)
 {
-    let delta     = $(e.target).val();
+    let delta     = $('[name=delta]:checked').val();
     let beginDate = $('input[name=begin]').val();
-    if(!beginDate) return;
+    if(!beginDate || !delta) return;
 
     delta     = currentDelta = parseInt(delta);
     beginDate = convertStringToDate(beginDate);
@@ -64,9 +64,9 @@ function formatDate(dateString, days)
  * @access public
  * @return void
  */
-function toggleDateBox(e)
+function toggleDateBox()
 {
-    if($(e.target).prop('checked'))
+    if($('[name=future]').prop('checked'))
     {
         $('#begin').attr('disabled', 'disabled');
         $('#end').attr('disabled', 'disabled').parents('.form-row').addClass('hidden');
diff --git a/module/productplan/js/create.ui.js b/module/productplan/js/create.ui.js
index 109c2b2b00..b0b4bda08f 100644
--- a/module/productplan/js/create.ui.js
+++ b/module/productplan/js/create.ui.js
@@ -1,6 +1,6 @@
 $(document).on('change', 'input[name=begin],input[name=end]', function()
 {
-    $("input[name='delta']").prop('checked', false);
+    $("[name='delta']:checked").prop('checked', false);
 });
 
 window.clickSubmit = function()
diff --git a/module/productplan/ui/create.html.php b/module/productplan/ui/create.html.php
index 61d93a10b4..008efa423c 100644
--- a/module/productplan/ui/create.html.php
+++ b/module/productplan/ui/create.html.php
@@ -68,6 +68,7 @@ formPanel
     ) : null,
     formRow
     (
+        set::width($lastPlan ? 'full' : '1/2'),
         formGroup
         (
             set::width('1/2'),
@@ -90,7 +91,7 @@ formPanel
     (
         formGroup
         (
-            set::width('1/4'),
+            set::width('1/3'),
             set::label($lang->productplan->begin),
             datepicker
             (
@@ -102,6 +103,7 @@ formPanel
         formGroup
         (
             setClass('items-center'),
+            set::width('2/3'),
             checkbox
             (
                 set::name('future'),
@@ -116,7 +118,7 @@ formPanel
     (
         formGroup
         (
-            set::width('1/4'),
+            set::width('1/3'),
             set::label($lang->productplan->end),
             set::control('date'),
             setID('end'),
@@ -124,6 +126,7 @@ formPanel
         ),
         formGroup
         (
+            set::width('2/3'),
             radioList
             (
                 set::name('delta'),