RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

assigned issues fixes

Browse Source
This commit is contained in:
VE10-Sanjeev 2025-05-16 13:16:06 +00:00
parent 0783b55a56
commit 8d26dd8cdb
11 changed files with 114 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Controllers/Inwardgateregister.php
View File

@ -1043,12 +1043,12 @@ function viewIGRDetails()
$str1 = $history[$j]->new_data;
$str2 = preg_replace('/\bIGR\b/i', '', $str1);
$str2 = trim($str2);
$str2 = ($str2 === "CREATED") ? "GENERATED" : $str2;
$str2 = ($str2 === "CREATED") ? "Completed" : ucwords($str2);
$history_content .= "<li> ".$history[$j]->IGR_No . " was <b> ` " . $str2 . " ` </b> by " . $history[$j]->FullName .
$history_content .= "<li> ".$history[$j]->IGR_No . " was <b> ` " . ucwords($str2) . " ` </b> by " . $history[$j]->FullName .
" on " . $history[$j]->indian_date . " at " . $history[$j]->indian_time. " </li><br>";
} else {
$history_content .= "<li> ".$history[$j]->IGR_No . " was <b> ` GENERATED ` </b> by " . $history[$j]->FullName .
$history_content .= "<li> ".$history[$j]->IGR_No . " was <b> ` Completed ` </b> by " . $history[$j]->FullName .
" on " . $history[$j]->indian_date . " at " . $history[$j]->indian_time. " </li><br>";
}
} else if (intval($history[$j]->is_edit) === 1) {
@ -1061,10 +1061,10 @@ function viewIGRDetails()
if ($history[$j]->field === "IGRStatus") {
$displayOldData = trim(preg_replace('/\bIGR\b/i', '', $displayOldData));
$displayOldData = ($displayOldData === "CREATED") ? "GENERATED" : $displayOldData;
$displayOldData = ($displayOldData === "CREATED") ? "Completed" : ucwords($displayOldData);
$displayNewData = trim(preg_replace('/\bIGR\b/i', '', $displayNewData));
$displayNewData = ($displayNewData === "CREATED") ? "GENERATED" : $displayNewData;
$displayNewData = ($displayNewData === "CREATED") ? "Completed" : ucwords($displayNewData);
}
if ($displayNewData || $displayOldData) {
@ -1077,7 +1077,7 @@ function viewIGRDetails()
} else if (intval($history[$j]->is_delete) === 1) {
$str = $history[$j]->field;
$fieldName = preg_replace('/([a-z])([A-Z])/', '$1 $2', $str);
$history_content .= "<li> ".$readable_field . " " . $history[$j]->new_data . " was deleted by " . $history[$j]->FullName .
$history_content .= "<li> ".$readable_field . " " . $history[$j]->new_data . " was Deleted by " . $history[$j]->FullName .
" on " . $history[$j]->indian_date . " at " . $history[$j]->indian_time. " </li><br>";
}
// $history_content .= "<br>" . $readable_field . ": `" . $history[$j]->old_data . "` was updated to `" . $history[$j]->new_data . "` .";

69
app/Views/accountsDashboard.php
View File

@ -1269,26 +1269,89 @@
});
// function constructSentence(record) {
// // let str = record.field;
// // let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2');
// let sentence = " ";
// if (parseInt(record.is_add) === 1) {
// sentence += record.IGR_No + " was Created by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time;
// } else if (parseInt(record.is_edit) === 1) {
// let str = record.field;
// if (str !== "UpdateBY" && str !== "MaterialRcvdDate" && str !== "DeliveryChellanDate") {
// let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2');
// sentence += ((record.IGRItem_No) ? record.MaterialName+" ( "+ record.MaterialCode + " ) - " : "")+fieldName+" "+record.old_data + " was Updated into " + record.new_data + " by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time;
// }
// } else if (parseInt(record.is_delete) === 1) {
// let str = record.field;
// let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2');
// sentence += fieldName+" "+record.new_data + " was deleted by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time;
// }
// return sentence;
// }
function constructSentence(record) {
// let str = record.field;
// let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2');
let sentence = " ";
if (parseInt(record.is_add) === 1) {
sentence += record.IGR_No + " was Created by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time;
sentence += "1"+record.IGR_No + " was Created by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time+" </br></br>";
if (record.field === "IGRStatus") {
str1 = record.new_data;
str2 = str1.replace(/\bIGR\b/i, '').trim().toUpperCase();
switch(str2) {
case "DRAFT": str2 = "Draft"; break;
case "CREATED": str2 = "Completed"; break;
case "CLOSED": str2 = "Closed"; break;
case "CANCELLED": str2 = "Cancelled"; break;
default: str2 = "-";
}
sentence += record.IGR_No + " was <b> ` " + capitalize(str2) + " ` </b> by " + record.FullName +
" on " + record.indian_date + " at " + record.indian_time;
} else {
sentence += record.IGR_No + " was <b> ` Completed ` </b> by " + record.FullName +
" on " + record.indian_date + " at " + record.indian_time;
}
} else if (parseInt(record.is_edit) === 1) {
let str = record.field;
if (str !== "UpdateBY" && str !== "MaterialRcvdDate" && str !== "DeliveryChellanDate") {
let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2');
sentence += ((record.IGRItem_No) ? record.MaterialName+" ( "+ record.MaterialCode + " ) - " : "")+fieldName+" "+record.old_data + " was Updated into " + record.new_data + " by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time;
let displayOldData = record.old_data === null || record.old_data === "" ? " " : record.old_data;
let displayNewData = record.new_data === null || record.new_data === "" ? " " : record.new_data;
if (record.field === "IGRStatus") {
displayOldData = displayOldData.replace(/\bIGR\b/i, '').trim().toUpperCase();
switch(displayOldData) {
case "DRAFT": displayOldData = "Draft"; break;
case "CREATED": displayOldData = "Completed"; break;
case "CLOSED": displayOldData = "Closed"; break;
case "CANCELLED": displayOldData = "Cancelled"; break;
default: displayOldData = "-";
}
displayNewData = displayNewData.replace(/\bIGR\b/i, '').trim().toUpperCase();
switch(displayNewData) {
case "DRAFT": displayNewData = "Draft"; break;
case "CREATED": displayNewData = "Completed"; break;
case "CLOSED": displayNewData = "Closed"; break;
case "CANCELLED": displayNewData = "Cancelled"; break;
default: displayNewData = "-";
}
}
if(displayNewData || displayOldData ){
sentence += ((record.IGRItem_No) ? record.MaterialName+" ( "+ record.MaterialCode + " ) - " : "")+fieldName+" <b> ` "+ displayOldData + " ` </b> was Updated into <b> ` " + displayNewData + " ` </b> by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time;
}
}
} else if (parseInt(record.is_delete) === 1) {
let str = record.field;
let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2');
sentence += fieldName+" "+record.new_data + " was deleted by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time;
sentence += fieldName+" "+record.new_data + " was Deleted by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time;
}
return sentence;
}
function capitalize(str) {
return str[0].toUpperCase() + str.slice(1);
}
</script>
<script>
function filecheck() {

4
app/Views/alterpurchaseorder.php
View File

@ -5349,7 +5349,7 @@ if (!empty($INRSYMBOL)) {
$options = array("0" => 'Item Code');
//print_r( $options);
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"','readonly="true"');
?>
</div>
@ -5628,7 +5628,7 @@ if (!empty($INRSYMBOL)) {
$options = array("0" => 'Item Code');
echo form_dropdown('EditRevenueMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditRevenueMaterialCode"', 'class="form-control"');
echo form_dropdown('EditRevenueMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditRevenueMaterialCode"', 'class="form-control"' ,'readonly="true"');
?>
</div>

2
app/Views/capitalpurchaseorder.php
View File

@ -1757,7 +1757,7 @@ if (!empty($INRSYMBOL)) {
<div>
<?php
$options = array("0" => 'Item Code');
echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control select2"');
echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control select2" readonly="true"');
?>
</div>
</div><!-- form-col-3 -->

2
app/Views/editCapitalAmendPO.php
View File

@ -1902,7 +1902,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
<div>
<?php
$options = array("0" => 'Item Code');
echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control select2"');
echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control select2"','readonly="true"');
?>
</div>
</div>

2
app/Views/editImportAmendPO.php
View File

@ -825,7 +825,7 @@ if (!empty($RequistionDetails)) {
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"');
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control" readonly="true"');
?>
</div>

2
app/Views/editServiceAmendPO.php
View File

@ -1555,7 +1555,7 @@ foreach ($PaymentTerms as $TER) {
$options = array("0" => 'Item Code');
//print_r( $options);
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"');
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control" readonly="true"');
?>
</div>

2
app/Views/importpo.php
View File

@ -1690,7 +1690,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"');
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"' ,'readonly="true"');
?>
</div>

2
app/Views/purchaseorder.php
View File

@ -2923,7 +2923,7 @@ if (!empty($INRSYMBOL)) {
$options = array("0" => 'Item Code');
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"');
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"','readonly="true"');
?>
</div>

2
app/Views/servicePurchaseorder.php
View File

@ -1574,7 +1574,7 @@ if (!empty($INRSYMBOL)) {
$options = array("0" => 'Item Code');
//print_r( $options);
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"');
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"','readonly="true"');
?>
</div>

43
app/Views/viewinwardgateregister.php
View File

@ -1748,16 +1748,22 @@
// let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2');
let sentence = " ";
if (parseInt(record.is_add) === 1) {
sentence += record.IGR_No + " was Created by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time+" </br></br>";
sentence += "1"+record.IGR_No + " was Created by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time+" </br></br>";
if (record.field === "IGRStatus") {
str1 = record.new_data;
str2 = str1.replace(/\bIGR\b/i, '').trim();
str2 = str2 == "CREATED" ? "GENERATED" : str2;
sentence += record.IGR_No + " was <b> ` " + str2 + " ` </b> by " + record.FullName +
str2 = str1.replace(/\bIGR\b/i, '').trim().toUpperCase();
switch(str2) {
case "DRAFT": str2 = "Draft"; break;
case "CREATED": str2 = "Completed"; break;
case "CLOSED": str2 = "Closed"; break;
case "CANCELLED": str2 = "Cancelled"; break;
default: str2 = "-";
}
sentence += record.IGR_No + " was <b> ` " + capitalize(str2) + " ` </b> by " + record.FullName +
" on " + record.indian_date + " at " + record.indian_time;
} else {
sentence += record.IGR_No + " was <b> ` GENERATED ` </b> by " + record.FullName +
sentence += record.IGR_No + " was <b> ` Completed ` </b> by " + record.FullName +
" on " + record.indian_date + " at " + record.indian_time;
}
} else if (parseInt(record.is_edit) === 1) {
@ -1767,10 +1773,24 @@
let displayOldData = record.old_data === null || record.old_data === "" ? " " : record.old_data;
let displayNewData = record.new_data === null || record.new_data === "" ? " " : record.new_data;
if (record.field === "IGRStatus") {
displayOldData = displayOldData.replace(/\bIGR\b/i, '').trim();
displayOldData = displayOldData == "CREATED" ? "GENERATED" : displayOldData;
displayNewData = displayNewData.replace(/\bIGR\b/i, '').trim();
displayNewData = displayNewData == "CREATED" ? "GENERATED" : displayNewData;
displayOldData = displayOldData.replace(/\bIGR\b/i, '').trim().toUpperCase();
switch(displayOldData) {
case "DRAFT": displayOldData = "Draft"; break;
case "CREATED": displayOldData = "Completed"; break;
case "CLOSED": displayOldData = "Closed"; break;
case "CANCELLED": displayOldData = "Cancelled"; break;
default: displayOldData = "-";
}
displayNewData = displayNewData.replace(/\bIGR\b/i, '').trim().toUpperCase();
switch(displayNewData) {
case "DRAFT": displayNewData = "Draft"; break;
case "CREATED": displayNewData = "Completed"; break;
case "CLOSED": displayNewData = "Closed"; break;
case "CANCELLED": displayNewData = "Cancelled"; break;
default: displayNewData = "-";
}
}
if(displayNewData || displayOldData ){
sentence += ((record.IGRItem_No) ? record.MaterialName+" ( "+ record.MaterialCode + " ) - " : "")+fieldName+" <b> ` "+ displayOldData + " ` </b> was Updated into <b> ` " + displayNewData + " ` </b> by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time;
@ -1779,10 +1799,13 @@
} else if (parseInt(record.is_delete) === 1) {
let str = record.field;
let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2');
sentence += fieldName+" "+record.new_data + " was deleted by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time;
sentence += fieldName+" "+record.new_data + " was Deleted by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time;
}
return sentence;
}
function capitalize(str) {
return str[0].toUpperCase() + str.slice(1);
}
</script>
<script>
function filecheck() {