bms: comparison www/js/profile_mash.js

comparison: www/js/profile_mash.js

www/js/profile_mash.js

changeset 688: 0ce464e42d8b
parent 563: acdd54144838
child 701: 3ce3df681be0

equal deleted inserted replaced

-:93ea9572c780
+:0ce464e42d8b
 /*****************************************************************************
-* Copyright (C) 2014-2019
+* Copyright (C) 2014-2020
 *
 * Michiel Broek <mbroek at mbse dot eu>
 *
-* This file is part of BrewCloud
+* This file is part of Brewery Management System
 *
 * This is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
 * Free Software Foundation; either version 2, or (at your option) any
 * later version.
 cache: false,
 data: data,
 type: 'POST',
 success: function(data, status, xhr) {
 commit(true);
-console.log('mash deleterow ' + rowid + ' success');
 location.reload(true);
 },
 error: function(jqXHR, textStatus, errorThrown) {
 commit(false);
 console.log('mash deleterow ' + textStatus);
 cache: false,
 data: data,
 type: 'POST',
 success: function(data, status, xhr) {
 commit(true);
-console.log('mash addrow ' + rowid + ' success');
 location.reload(true);
 },
 error: function(jqXHR, textStatus, errorThrown) {
 commit(false);
 console.log('mash addrow ' + textStatus);
 cache: false,
 data: data,
 type: 'POST',
 success: function(data, status, xhr) {
 commit(true);
-console.log('mash updaterow ' + rowid + ' success');
 location.reload(true);
 },
 error: function(jqXHR, textStatus, errorThrown) {
 commit(false);
 console.log('mash updaterow ' + textStatus);
 dataAdapter = new $.jqx.dataAdapter(source),
 editrow = -1,
 // Inline steps editor
 editsteps = function(data) {
-var generaterow = function() {
-var row = {};
-row['step_name'] = 'Stap 1';
-row['step_type'] = 0;
-row['step_temp'] = 62.0;
-row['step_time'] = 20.0;
-row['ramp_time'] = 1.0;
-row['end_temp'] = 62.0;
-return row;
-};
 var stepSource = {
 localdata: data.steps,
 datatype: 'local',
 datafields: [
 { name: 'step_name', type: 'string' },
 { name: 'step_temp', type: 'float' },
 { name: 'step_time', type: 'float' },
 { name: 'ramp_time', type: 'float' },
 { name: 'end_temp', type: 'float' }
 ],
-addrow: function(rowid, rowdata, position, commit) {
+addrow: function(rowid, rowdata, position, commit) { commit(true); },
-commit(true);
+deleterow: function(rowid, commit) { commit(true); }
-},
-deleterow: function(rowid, commit) {
-commit(true);
-}
 },
 stepAdapter = new $.jqx.dataAdapter(stepSource);
 $('#grid').jqxGrid({
 width: 1020,
 container.append('<input style="margin-left: 450px;" id="deleterowbutton" type="button" value="Verwijder stap" />');
 $('#addrowbutton').jqxButton({ template: 'primary', theme: theme, width: 150 });
 $('#deleterowbutton').jqxButton({ template: 'danger', theme: theme, width: 150 });
 // create new row.
 $('#addrowbutton').on('click', function() {
-var datarow = generaterow();
+var row = {}, rowscount = $('#grid').jqxGrid('getdatainformation').rowscount;
-$('#grid').jqxGrid('addrow', null, datarow);
+var temp = $('#grid').jqxGrid('getcell', rowscount -1, 'step_temp');
+row['step_name'] = 'Stap ' + (rowscount + 1);
+if (rowscount > 0) {
+row['step_type'] = 1;
+row['step_temp'] = row['end_temp'] = temp.value + 2;
+} else {
+row['step_type'] = 0;
+row['step_temp'] = row['end_temp'] = 62.0;
+}
+row['step_time'] = 20.0;
+row['ramp_time'] = 1.0;
+$('#grid').jqxGrid('addrow', null, row);
 });
 // delete row.
 $('#deleterowbutton').on('click', function() {
 var rowscount, id, selectedrowindex = $('#grid').jqxGrid('getselectedrowindex');
 rowscount = $('#grid').jqxGrid('getdatainformation').rowscount;
 },
 columns: [
 { text: 'Stap naam', datafield: 'step_name' },
 { text: 'Stap type', datafield: 'step_type', width: 150,
 cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) {
-return '<div style="margin: 4px;">' + MashStepTypeData[value].nl + '</div>';
+return '<span style="margin: 4px; margin-top: 6px; float: left;">' + MashStepTypeData[value].nl + '</span>';
 }
 },
-{ text: 'Begin &deg;C', datafield: 'step_temp', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+{ text: 'Start &deg;C', datafield: 'step_temp', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
-{ text: 'Eind &deg;C', datafield: 'end_temp', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+{ text: 'Eind &deg;C', datafield: 'end_temp', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
 { text: 'Rust min.', datafield: 'step_time', width: 90, align: 'right', cellsalign: 'right' },
 { text: 'Stap min.', datafield: 'ramp_time', width: 90, align: 'right', cellsalign: 'right' },
-{ text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center',
+{ text: '', columntype: 'button', width: 15, align: 'center',
+cellsrenderer: function(row) {
+if (row < 2)
+return ' ';
+return '▴';
+}, buttonclick: function(row) {
+if (row >= 2) {
+swapMash(row, row-1);
+}
+}
+},
+{ text: '', columntype: 'button', width: 15, align: 'center',
+cellsrenderer: function(row) {
+rowscount = $('#grid').jqxGrid('getdatainformation').rowscount;
+if (row < 1 || row > (rowscount -2))
+return ' ';
+return '▾';
+}, buttonclick: function(row) {
+rowscount = $('#grid').jqxGrid('getdatainformation').rowscount;
+if (row >= 1 && row <= (rowscount -2)) {
+swapMash(row, row+1);
+}
+}
+},
+{ text: '', datafield: 'Edit', columntype: 'button', width: 80, align: 'center',
 cellsrenderer: function() {
 return 'Wijzig';
 }, buttonclick: function(row) {
 steprow = row;
 stepData = $('#grid').jqxGrid('getrowdata', steprow);
 height: 630,
 source: dataAdapter,
 theme: theme,
 showstatusbar: true,
 renderstatusbar: function(statusbar) {
-var addButton, container = $('<div style="overflow: hidden; position: relative; margin: 5px;"></div>');
+var container = $('<div style="overflow: hidden; position: relative; margin: 5px;"></div>');
-addButton = $('<div style="float: right; margin-right: 15px;"><img style="position: relative; margin-top: 2px;" ' +
+var addButton = $('<div style="float: right; margin-right: 15px;"><img style="position: relative; margin-top: 2px;" ' +
 'src="images/add.png"/><span style="margin-left: 4px; position: relative; top: -3px;">Add</span></div>');
-expButton = $('<div style="float: right; margin-right: 50px;"><img style="position: relative; margin-top: 2px;" ' +
+var expButton = $('<div style="float: right; margin-right: 50px;"><img style="position: relative; margin-top: 2px;" ' +
 'src="images/database.png"/><span style="margin-left: 4px; position: relative; top: -3px;">Export</span></div>');
 container.append(addButton);
 container.append(expButton);
 statusbar.append(container);
 addButton.jqxButton({ theme: theme, width: 90, height: 20 });
 });
 expButton.click(function(event) {
 window.open('export_mashs.php');
 });
 },
-filterable: true,
-filtermode: 'excel',
 columns: [
 { text: 'Maish schema', datafield: 'name', width: 250 },
 { text: 'Opmerkingen', datafield: 'notes' },
 { text: '', datafield: 'Edit', width: 100, align: 'center', columntype: 'button',
 cellsrenderer: function() {
 } else {
 $('#jqxgrid').jqxGrid('addrow', null, row);
 }
 $('#popupWindow').jqxWindow('hide');
 });
+function swapMash(r1, r2) {
+console.log('swap mash rows ' + r1 + ' ' + r2);
+var row1 = $('#grid').jqxGrid('getrowdata', r1);
+var row2 = $('#grid').jqxGrid('getrowdata', r2);
+var obj1 = { step_name: row1.step_name, step_type: row1.step_type, step_temp: row1.step_temp, step_time: row1.step_time,
+ramp_time: row1.ramp_time, end_temp: row1.end_temp };
+var obj2 = { step_name: row2.step_name, step_type: row2.step_type, step_temp: row2.step_temp, step_time: row2.step_time,
+ramp_time: row2.ramp_time, end_temp: row2.end_temp };
+$("#grid").jqxGrid('updaterow', r1, obj2);
+$("#grid").jqxGrid('updaterow', r2, obj1);
+}
 createDelElements();
 });