Skip to content
This repository has been archived by the owner on Jul 23, 2018. It is now read-only.

Temp master #61

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

Temp master #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1dbd0e
Convert absolute url to relative url
ryanstrat Feb 11, 2015
4003727
Fix for #57. No longer checks the number of barcodes added
ryanstrat Feb 15, 2015
a906010
#57 enable button by default
ryanstrat Feb 15, 2015
d9cf7dd
Fix for #60. Additional improvements to colorization and validation o…
ryanstrat Feb 15, 2015
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
31 changes: 12 additions & 19 deletions js/add.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,17 +166,14 @@ function addAttributes(fields) {

function validatePartName() {
var partName = allowedChars.test($("#partNameInput").val());
var ret;

if (partName || !$("#partNameInput").val()) {
$("#partNameInput").parent().removeClass("has-error");
ret = 1;
} else {
$("#partNameInput").parent().addClass("has-error");
ret = 0;
}

return ret;
return partName && $("#partNameInput").val().length !== 0;
}

function validateDescription() {
Expand All @@ -185,10 +182,10 @@ function validateDescription() {

if (description || !$("#descriptionInput").val()) {
$("#descriptionInput").parent().removeClass("has-error");
return 1;
return true;
} else {
$("#descriptionInput").parent().addClass("has-error");
return 0;
return false;
}

return ret;
Expand All @@ -201,32 +198,26 @@ function validateCategory() {

function validateDatasheet() {
var datasheet = /^[^'"\\\s]+$/.test($("#datasheetInput").val());
var ret;

if (datasheet || !$("#datasheetInput").val()) {
$("#datasheetInput").parent().removeClass("has-error");
ret = 1;
} else {
$("#datasheetInput").parent().addClass("has-error");
ret = 0;
}

return ret;
return datasheet && $("#datasheetInput").val().length !== 0;
}

function validateLocation() {
var location = allowedChars.test($("#locationInput").val());
var ret;

if (location || !$("#locationInput").val()) {
$("#locationInput").parent().removeClass("has-error");
ret = 1;
} else {
$("#locationInput").parent().addClass("has-error");
ret = 0;
}

return ret;
return location && $("#locationInput").val().length !== 0;
}

function validateEditDetails() {
Expand Down Expand Up @@ -285,8 +276,6 @@ function validateBarcode() {
}
});

flag = flag && $("#barcode table tbody tr").length > 1;

return flag;
}

Expand Down Expand Up @@ -507,16 +496,20 @@ $(document).ready(function () {

$('#locationInput').on("change keyup paste", function () {
var location = allowedChars.test($("#locationInput").val());
if (location) {
if (location && $("#locationInput").val()) {
var query = {"location": $(this).val()};
$.post("/validate/location", query, function (result) {
if (result == 1) {
$("#locationInput").parent().removeClass("has-error");
$("#locationInput").parent().removeClass("has-warning");
$("#locationInput").parent().addClass("has-success");
} else {
$("#locationInput").parent().addClass("has-error");
$("#locationInput").parent().addClass("has-warning");
$("#locationInput").parent().removeClass("has-success");
}
});
} else {
$("#locationInput").parent().removeClass("has-warning");
$("#locationInput").parent().removeClass("has-success");
}
});

Expand Down
2 changes: 1 addition & 1 deletion js/inventory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ $(document).ready(function () {

var engine = new Bloodhound({
name: 'parts',
remote: 'http://dev.rj.str.at/livesearch?q=%QUERY',
remote: '/livesearch?q=%QUERY',
//remote: 'http://rj.localhost/livesearch?q=%QUERY',
datumTokenizer: function(d) {
return Bloodhound.tokenizers.whitespace(d.val);
Expand Down
2 changes: 1 addition & 1 deletion templates/add.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ class="sr-only">Close</span></button>
<div id="btn-confirm-back" class="round-icon pull-left back btn-enabled">
<span class="glyphicon glyphicon-chevron-left"></span>
</div>
<div id="btn-confirm-submit" class="round-icon pull-right submit">
<div id="btn-confirm-submit" class="round-icon pull-right submit btn-enabled">
<span class="glyphicon glyphicon-ok"></span>
</div>
<!--</div>-->
Expand Down