SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QAD Issue Fixes

Browse Source
This commit is contained in:
velz2020 2017-12-08 17:53:33 +05:30
parent 5a7a0b5250
commit 35283b7e73
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/quality.php
View File

@ -261,7 +261,7 @@ class quality extends BaseController
{ {
$count++; $count++;
if($count != 12){ if($count != 12){
$ssize = $afs['Sieve Size ľm']; $ssize = $afs['Sieve Size µm'];
$sandweight = $afs['Sand Weight']; $sandweight = $afs['Sand Weight'];
$Percentage = $afs['Percentage']; $Percentage = $afs['Percentage'];
$Multiplier = $afs['Multiplier']; $Multiplier = $afs['Multiplier'];

2
application/models/quality_model.php
View File

@ -102,7 +102,7 @@ class Quality_model extends CI_Model
$this->db->join('ip_clients','ip_invoices.client_id=ip_clients.client_id'); $this->db->join('ip_clients','ip_invoices.client_id=ip_clients.client_id');
$this->db->join('ip_invoice_items','ip_invoices.invoice_id=ip_invoice_items.invoice_id'); $this->db->join('ip_invoice_items','ip_invoices.invoice_id=ip_invoice_items.invoice_id');
$this->db->join('ip_products','ip_invoice_items.item_product_id=ip_products.product_id'); $this->db->join('ip_products','ip_invoice_items.item_product_id=ip_products.product_id');
$this->db->join('ip_invoice_custom','ip_invoices.invoice_number=ip_invoice_custom.invoice_id and invoice_custom_fieldid=62'); $this->db->join('ip_invoice_custom','ip_invoices.invoice_id=ip_invoice_custom.invoice_id and invoice_custom_fieldid=62');
$this->db->where('ip_invoices.invoice_number NOT IN (SELECT invoiceid from T_Test_Report_Master)',NULL,false); $this->db->where('ip_invoices.invoice_number NOT IN (SELECT invoiceid from T_Test_Report_Master)',NULL,false);
$this->db->order_by('ip_invoices.invoice_number'); $this->db->order_by('ip_invoices.invoice_number');
$res = $this->db->get(); $res = $this->db->get();

4
application/views/qualityreport.php
View File

@ -591,7 +591,7 @@ function calculateMaster(id)
{ {
var ide = z+'result'; var ide = z+'result';
var res = document.getElementById(ide).textContent; var res = document.getElementById(ide).textContent;
console.log(res) //console.log(res)
if(res != 'OK') if(res != 'OK')
{ {
flag++; flag++;
@ -812,7 +812,7 @@ var ctx = c.getContext("2d");
ctx.clearRect(0, 0, c.width, c.height); ctx.clearRect(0, 0, c.width, c.height);
var xlabels = datalabel; var xlabels = datalabel;
var xlabelscount = xlabels.length; var xlabelscount = xlabels.length;
console.log(xlabelscount); //console.log(xlabelscount);
var dataset = dataset; var dataset = dataset;
Array.prototype.max = function() { Array.prototype.max = function() {