Skip to content

Added mode selection buttons in main UI #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Forceu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added mode selection buttons in main UI #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09ae761
Added mode selection buttons. TODO: proper UI for buttons
Forceu May 28, 2020
1af4f9e
Merge branch 'master' into modeselection
Forceu Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 54 additions & 36 deletions incl/css/styleMain.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,74 @@

.modal {
display: none; /* Hidden by default */
position: fixed; /* Stay in place */
z-index: 101; /* Sit on top */
padding-top: 100px; /* Location of the box */
left: 0;
top: 0;
width: 100%; /* Full width */
height: 100%; /* Full height */
overflow: auto; /* Enable scroll if needed */
background-color: rgb(0,0,0); /* Fallback color */
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
display: none; /* Hidden by default */
position: fixed; /* Stay in place */
z-index: 101; /* Sit on top */
padding-top: 100px; /* Location of the box */
left: 0;
top: 0;
width: 100%; /* Full width */
height: 100%; /* Full height */
overflow: auto; /* Enable scroll if needed */
background-color: rgb(0, 0, 0); /* Fallback color */
background-color: rgba(0, 0, 0, 0.4); /* Black w/ opacity */
}

.modal-content {
background-color: #fefefe;
margin: auto;
padding: 20px;
border: 1px solid #888;
width: 80%;
overflow-y: auto;
background-color: #fefefe;
margin: auto;
padding: 20px;
border: 1px solid #888;
width: 80%;
overflow-y: auto;
}

.close {
color: #aaaaaa;
float: right;
font-size: 28px;
font-weight: bold;
color: #aaaaaa;
float: right;
font-size: 28px;
font-weight: bold;
}

.close:hover,
.close:focus {
color: #000;
text-decoration: none;
cursor: pointer;
color: #000;
text-decoration: none;
cursor: pointer;
}


/* Collapsible content, hidden by default */
.collapsible-content {
padding: 0 18px;
max-height: 0;
overflow: hidden;
transition: max-height 0.2s ease-out;
}


/* 100% Image Width on Smaller Screens */
@media only screen and (max-width: 700px){
.modal-content {
width: 98%;
height: 98%;
padding: 5px;
}
@media only screen and (max-width: 700px) {
.modal-content {
width: 98%;
height: 98%;
padding: 5px;
}

.modal {
padding-top: 0px;
}
.modal {
padding-top: 0px;
}

.button-mobile-fullsize {
width: 100%;
}
}

#button_add_manual {
width: 100%;
}

.grid-container {
display: grid;
align-content: center;
justify-content: end;
grid-template-columns: auto auto auto auto auto;
grid-gap: 10px;
padding: 10px;
}
172 changes: 90 additions & 82 deletions incl/js/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,49 @@
function enableButton(idSelect, idButtonAdd, idButtonConsume)
{

var oSelect = document.getElementById(idSelect);
var oButtonAdd = document.getElementById(idButtonAdd);
var oButtonConsume = document.getElementById(idButtonConsume);
oButtonAdd.disabled = oSelect.value == "0";
oButtonConsume.disabled = oSelect.value == "0";
}

function sleep (time) {
return new Promise((resolve) => setTimeout(resolve, time));
function enableButton(idSelect, idButtonAdd, idButtonConsume) {

var oSelect = document.getElementById(idSelect);
var oButtonAdd = document.getElementById(idButtonAdd);
var oButtonConsume = document.getElementById(idButtonConsume);
oButtonAdd.disabled = oSelect.value == "0";
oButtonConsume.disabled = oSelect.value == "0";
}

function sleep(time) {
return new Promise((resolve) => setTimeout(resolve, time));
}


function checkAndReturn() {
var button = document.getElementById("save-settings");

button.setAttribute("disabled","");
componentHandler.upgradeElement(button);

var form1 = document.getElementById("settings1_form");
var form2 = document.getElementById("settings2_form");
var form3 = document.getElementById("settings3_form");

var postString = serialize(form1)+'&'+serialize(form2)+'&'+serialize(form3);

var xhr = new XMLHttpRequest();
xhr.onreadystatechange = function() {
if (this.readyState == 4) {
if (this.status == 200) {
//window.location.href = 'settings.php';
if (xhr.responseText == "OK")
showToast("Settings saved.");
else
showToast("Settings not saved, unknown response!");
button.removeAttribute("disabled");
componentHandler.upgradeElement(button);
} else {
showToast("Error communicating, settings not saved!");
}
}
};
xhr.open("POST", 'settings.php', true);
xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
xhr.send(postString);
}
var button = document.getElementById("save-settings");

button.setAttribute("disabled", "");
componentHandler.upgradeElement(button);

var form1 = document.getElementById("settings1_form");
var form2 = document.getElementById("settings2_form");
var form3 = document.getElementById("settings3_form");

var postString = serialize(form1) + '&' + serialize(form2) + '&' + serialize(form3);

var xhr = new XMLHttpRequest();
xhr.onreadystatechange = function () {
if (this.readyState == 4) {
if (this.status == 200) {
//window.location.href = 'settings.php';
if (xhr.responseText == "OK")
showToast("Settings saved.");
else
showToast("Settings not saved, unknown response!");
button.removeAttribute("disabled");
componentHandler.upgradeElement(button);
} else {
showToast("Error communicating, settings not saved!");
}
}
};
xhr.open("POST", 'settings.php', true);
xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
xhr.send(postString);
}


/*!
Expand All @@ -55,48 +54,48 @@ function checkAndReturn() {
*/
var serialize = function (form) {

// Setup our serialized data
var serialized = [];
// Setup our serialized data
var serialized = [];

// Loop through each field in the form
for (var i = 0; i < form.elements.length; i++) {
// Loop through each field in the form
for (var i = 0; i < form.elements.length; i++) {

var field = form.elements[i];
var field = form.elements[i];

// Don't serialize fields without a name, submits, buttons, file and reset inputs, and disabled fields
if (!field.name || field.disabled || field.type === 'file' || field.type === 'reset' || field.type === 'submit' || field.type === 'button') continue;
// Don't serialize fields without a name, submits, buttons, file and reset inputs, and disabled fields
if (!field.name || field.disabled || field.type === 'file' || field.type === 'reset' || field.type === 'submit' || field.type === 'button') continue;

// If a multi-select, get all selections
if (field.type === 'select-multiple') {
for (var n = 0; n < field.options.length; n++) {
if (!field.options[n].selected) continue;
serialized.push(encodeURIComponent(field.name) + "=" + encodeURIComponent(field.options[n].value));
}
}
// If a multi-select, get all selections
if (field.type === 'select-multiple') {
for (var n = 0; n < field.options.length; n++) {
if (!field.options[n].selected) continue;
serialized.push(encodeURIComponent(field.name) + "=" + encodeURIComponent(field.options[n].value));
}
}

// Convert field data to a query string
else if ((field.type !== 'checkbox' && field.type !== 'radio') || field.checked) {
serialized.push(encodeURIComponent(field.name) + "=" + encodeURIComponent(field.value));
}
}
// Convert field data to a query string
else if ((field.type !== 'checkbox' && field.type !== 'radio') || field.checked) {
serialized.push(encodeURIComponent(field.name) + "=" + encodeURIComponent(field.value));
}
}

return serialized.join('&');
return serialized.join('&');

};

function enableButtonGen(buttonId, textId, previousInput) {
var text=document.getElementById(textId).value;
document.getElementById(buttonId).disabled=(text===previousInput);
var text = document.getElementById(textId).value;
document.getElementById(buttonId).disabled = (text === previousInput);
}

function openNewTab(url, barcode) {
var win = window.open(url, "New Grocy product");
var timer = setInterval(function() {
if (win.closed) {
clearInterval(timer);
window.location = "index.php?refreshbarcode="+barcode;
}
}, 500);
var win = window.open(url, "New Grocy product");
var timer = setInterval(function () {
if (win.closed) {
clearInterval(timer);
window.location = "index.php?refreshbarcode=" + barcode;
}
}, 500);
}

function showToast(messageText) {
Expand All @@ -108,14 +107,23 @@ function showToast(messageText) {


function showQrCode(content) {
document.getElementsByClassName("close")[0].onclick = function() {
document.getElementById("qrcode-modal").style.display = "none";
document.getElementById('btn_apilinks').style.display = "block";
}
var qr = qrcode(0, 'L');
qr.addData(content);
qr.make();
document.getElementById('btn_apilinks').style.display = "none";
document.getElementById('placeHolder').innerHTML = qr.createImgTag(10,5);
document.getElementById("qrcode-modal").style.display = "block";
document.getElementsByClassName("close")[0].onclick = function () {
document.getElementById("qrcode-modal").style.display = "none";
document.getElementById('btn_apilinks').style.display = "block";
}
var qr = qrcode(0, 'L');
qr.addData(content);
qr.make();
document.getElementById('btn_apilinks').style.display = "none";
document.getElementById('placeHolder').innerHTML = qr.createImgTag(10, 5);
document.getElementById("qrcode-modal").style.display = "block";
}

function addBarcodeToTextbox(barcode) {
var textbox = document.getElementById("newbarcodes");
var lines = textbox.value.split("\n");
var lastLine = lines[lines.length - 1];
if (lastLine !== '')
textbox.value = textbox.value + "\n";
textbox.value = textbox.value + barcode;
}
18 changes: 18 additions & 0 deletions incl/js/scripts_top.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,22 @@ function updateQrCode() {
qrData["url"] = document.getElementById("qr_url").value;
qrData["key"] = document.getElementById("qr_key").value;
generateAppQrCode(qrData);
}


function addCollapsables() {
var coll = document.getElementsByClassName("collapsible");
var i;

for (i = 0; i < coll.length; i++) {
coll[i].addEventListener("click", function() {
this.classList.toggle("fl-hidden"); //originally "active", so that it is still visible
var content = this.nextElementSibling;
if (content.style.maxHeight){
content.style.maxHeight = null;
} else {
content.style.maxHeight = content.scrollHeight + "px";
}
});
}
}
Loading