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

Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

Browse Source
This commit is contained in:
vadivelJ96 2025-05-17 12:54:56 +05:30
commit ee96a78327
12 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/Views/EditservicePurchaseorder.php
View File

@ -1027,14 +1027,9 @@ if (!empty($getlogpodtl)) {
<!--start new fields 1 sep-->
<div class="form-group col-md-12">
<label>Description Of Service <span class="text-danger">*</label>
<?php
$DescriptionOfPo = html_entity_decode($DescriptionOfPo);
$DescriptionOfPo = strip_tags($DescriptionOfPo);
$data = array('name' => 'editdescofpo', 'value' => set_value('editdescofpo', $DescriptionOfPo), 'id' => 'editdescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data);
?>
<textarea id="editdescofpo" name="editdescofpo" class="form-control" rows="3" cols="40">
<?php echo $DescriptionOfPo ? html_entity_decode($DescriptionOfPo) : ""; ?>
</textarea>
</div><!--end new fields 1 sep-->
</div>
@ -1622,7 +1617,7 @@ if (!empty($getlogpodtl)) {
$options = array("0" => 'Item Code');
//print_r( $options);
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control" readonly = "true"');
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control" readonly = "true" style="pointer-events: none;"');
?>
</div>
@ -2354,6 +2349,7 @@ if (!empty($getlogpodtl)) {
var Frequency = $("#EditFrequency").val();
var FrequencyValue = $("#EditFrequencyNo").val();
var ServiceDescription = $('#EdittxtSpcialInstruction').val();
var OtherAmt = $('#EditOtherAllowances').val();
var TotalOrderValue = $("#EditTotalOrderValue").val();
@ -2778,6 +2774,17 @@ if (!empty($getlogpodtl)) {
}
}
function EditExceedQuantityCheck() {
// RequistQuantity
var EnterQuantity = $("#EditQuantity").val() == '' ? "0.00" : parseFloat($("#EditQuantity").val());
var ReqQuantity = parseFloat(RequistQuantity);
if (EnterQuantity > ReqQuantity) {
alert('Your exceeding the Quantity from the Requisition Quantity:' + RequistQuantity + '.Please adjust the Quantity to proceed further.');
$('#EditQuantity').focus();
return false;
}
}
//
</script>

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"','readonly="true"');
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control" readonly="true" style="pointer-events: none;"');
?>
</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"' ,'readonly="true"');
echo form_dropdown('EditRevenueMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditRevenueMaterialCode"', 'class="form-control"' ,'readonly="true" style="pointer-events: none;"');
?>
</div>

5
app/Views/attendance.php
View File

@ -399,6 +399,11 @@ $currentday = date('d');
<?php $index = 0;
$row = 0;
usort($finalarray, function($a, $b) {
return strcmp($a->EmpID, $b->EmpID);
});
foreach ($finalarray as $a) {
$row++;
$index++; ?>

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" readonly="true"');
echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control select2" readonly="true" style="pointer-events: none;"');
?>
</div>
</div><!-- form-col-3 -->

2
app/Views/editCapitalPo.php
View File

@ -2536,7 +2536,7 @@ $(document).ready(function () {
<div>
<?php
$options = array("0" => 'Item Code');
echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control select2" readonly = "true"');
echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control select2" readonly = "true" style="pointer-events: none;"');
?>
</div>
</div>

2
app/Views/editImportAmendPO.php
View File

@ -1606,7 +1606,7 @@ if (!empty($RequistionDetails)) {
// echo form_textarea($data);
?> -->
<textarea id="txtSpcialInstruction" name="txtSpcialInstruction" class="form-control" rows="10" cols="40">
<?php echo html_entity_decode($ServiceDescription); ?>
<?php echo $ServiceDescription ? html_entity_decode($ServiceDescription) : ""; ?>
</textarea>
</div>
</div>

2
app/Views/editRevenuepurchaseorder.php
View File

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

2
app/Views/editServiceAmendPO.php
View File

@ -1382,7 +1382,7 @@ foreach ($PaymentTerms as $TER) {
<label>Scope Of Work</label>
<textarea name="ScopeofWork" id="ScopeofWork" class="form-control" rows="8" cols="40">
<?php
$ServiceDescription = html_entity_decode($ServiceDescription);
$ServiceDescription = $ServiceDescription ? html_entity_decode($ServiceDescription) : '';
// $ServiceDescription = strip_tags($ServiceDescription);
echo set_value('ScopeofWork', $ServiceDescription); ?>
</textarea>

4
app/Views/editimportpo.php
View File

@ -1325,7 +1325,7 @@ if (!empty($getlogpodtl)) {
// echo form_textarea($data);
?> -->
<textarea id="txtSpcialInstruction" name="txtSpcialInstruction" class="form-control" rows="10" cols="40">
<?php echo html_entity_decode($ServiceDescription); ?>
<?php echo $ServiceDescription ? html_entity_decode($ServiceDescription) : ''; ?>
</textarea>
</div>
@ -2119,7 +2119,7 @@ if (!empty($getlogpodtl)) {
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control " readonly = "true"');
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control " readonly = "true" style="pointer-events: none;"');
?>
</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"' ,'readonly="true"');
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control" readonly="true" style="pointer-events: none;"');
?>
</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"','readonly="true"');
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control" readonly="true" style="pointer-events: none;"');
?>
</div>

12
app/Views/servicePurchaseorder.php
View File

@ -676,7 +676,7 @@ if (!empty($INRSYMBOL)) {
});
clearTotalItemValues();
$('#Edit').click(function() {
$('.EditService').click(function(){
console.log("1111111111111111111");
// tinyMCE.triggerSave();
@ -716,7 +716,8 @@ if (!empty($INRSYMBOL)) {
var Frequency = $("#EditFrequency").val();
var FrequencyValue = $("#EditFrequencyNo").val();
var ServiceDescription = $('#EdittxtSpcialInstruction').val();
// var ServiceDescription = $('#EdittxtSpcialInstruction').val();
var ServiceDescription = tinymce.get('EdittxtSpcialInstruction').getContent();
var OtherAmt = $('#EditOtherAllowances').val();
var TotalOrderValue = $("#EditTotalOrderValue ").val();
@ -760,6 +761,7 @@ if (!empty($INRSYMBOL)) {
$('#TotalOrderValue' + userid).val(TotalOrderValue);
populateValueMainFormForEditServiceTax();
$('#EDITSERVICELINEITEM').modal('hide');
}
@ -1574,7 +1576,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"','readonly="true"');
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control" readonly="true" style="pointer-events: none;"');
?>
</div>
@ -1789,7 +1791,6 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
</div><!-- /.modal -->
</div>
@ -1865,7 +1866,7 @@ if (!empty($INRSYMBOL)) {
$('#EditotherDescription').show();
}
console.log($('#ItemDescription' + userid).val());
tinyMCE.get('EdittxtSpcialInstruction').setContent($('#ItemDescription' + userid).val());
//$('#EdittxtSpcialInstruction').val($('#ItemDescription'+userid).val());
@ -1900,7 +1901,6 @@ if (!empty($INRSYMBOL)) {
});
// tinyMCE.get('EdittxtSpcialInstruction').setContent($('#ItemDescription' + userid).val());
$('#EdittxtSpcialInstruction').val($('#ItemDescription'+userid).val());