From 97f42dca4211930fdd343e19f587cb760fbf12b9 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Wed, 17 Jan 2024 09:22:38 +0000
Subject: [PATCH]  * Adjust budget tip.

---
 module/program/js/common.ui.js    | 16 +++++++---------
 module/program/ui/create.html.php |  1 +
 module/program/ui/edit.html.php   |  1 +
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/module/program/js/common.ui.js b/module/program/js/common.ui.js
index 37bf81ce78..d7d57092e5 100644
--- a/module/program/js/common.ui.js
+++ b/module/program/js/common.ui.js
@@ -292,23 +292,21 @@ window.budgetOverrunTips = function(e)
 
     var selectedProgramID = $('[name=parent]').zui('picker').$.state.value;
     var budget            = $('#budget').val();
+
     if(selectedProgramID == 0)
     {
-        if($('#beyondBudgetTip').length > 0) $('#beyondBudgetTip').closest('.form-row').remove();
+        $('#budgetTip').addClass('hidden');
         return false;
     }
 
-    if(typeof(programID) == 'undefined') programID = 0;
-    $.get($.createLink('project', 'ajaxGetProjectFormInfo', 'objectType=program&objectID=' + programID + "&selectedProgramID=" + selectedProgramID), function(data)
+    if(budget > parentBudgetData)
     {
-        var data = JSON.parse(data);
+        let ignoreBtn = "<span id='ignore' onclick='ignoreTip(this)'>" + ignore + "</span>";
 
-        var tip = "";
-        if(budget !=0 && budget !== null && budget > data.availableBudget) var tip = "<div class='form-row'><div class='form-group'><div class='input-group'><p id='beyondBudgetTip' class='text-remind'><span>" + budgetOverrun + currencySymbol[data.budgetUnit] + data.availableBudget + "</span><span id='ignore' onclick='ignoreTip(this)'>" + ignore + "</span></p></div></div></div>";
+        if(!$('#budgetTip').find('#ignore').length) $('#budgetTip').append(ignoreBtn);
 
-        if($('#beyondBudgetTip').length > 0) $('#beyondBudgetTip').closest('.form-row').remove();
-        $('[name=budget]').parent().after(tip);
-    });
+        $('#budgetTip').removeClass('hidden');
+    }
 }
 
 /**
diff --git a/module/program/ui/create.html.php b/module/program/ui/create.html.php
index 7ecc4cd4cb..f2be9c40c1 100644
--- a/module/program/ui/create.html.php
+++ b/module/program/ui/create.html.php
@@ -16,6 +16,7 @@ jsVar('currencySymbol',      $lang->project->currencySymbol);
 jsVar('budgetOverrun',       $lang->project->budgetOverrun);
 jsVar('parentBeginDate',     $parentProgram ? $parentProgram->begin : '');
 jsVar('parentEndDate',       $parentProgram ? $parentProgram->end : '');
+jsVar('parentBudgetData',    $parentProgram ? $parentProgram->budget : '');
 
 $fields = useFields('program.create');
 
diff --git a/module/program/ui/edit.html.php b/module/program/ui/edit.html.php
index d15d2b743e..45b7a4a193 100644
--- a/module/program/ui/edit.html.php
+++ b/module/program/ui/edit.html.php
@@ -17,6 +17,7 @@ jsVar('currencySymbol',      $lang->project->currencySymbol);
 jsVar('budgetOverrun',       $lang->project->budgetOverrun);
 jsVar('parentBeginDate',     $parentProgram ? $parentProgram->begin : '');
 jsVar('parentEndDate',       $parentProgram ? $parentProgram->end : '');
+jsVar('parentBudgetData',    $parentProgram ? $parentProgram->budget : '');
 
 $fields = useFields('program.edit');