-
Notifications
You must be signed in to change notification settings - Fork 3
Log items that share the same UUID #53
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.
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
Spazcool
wants to merge
17
commits into
master
Choose a base branch
from
logDouble
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
9790b58
REFACTOR: logScanned to catch doubled UUIDs & render doubles on template
Spazcool f19fcc8
FIX: hacked out bug
Spazcool 4aea460
REMOVE: cut duplication in logScanned func
Spazcool e4bb3c8
REFACTOR: logScanned works again
Spazcool b6dc388
REMOVE: double UUID conditional from recent.ejs
Spazcool 93da255
ADD: double UUID conditional without duplicate code
Spazcool cae791d
ADD: double UUID conditional without duplicate code
Spazcool 5b37912
ADD: link to item row in spreadsheet to both item obj and recent.ejs
Spazcool 6f7a97f
Refactoring/simplifying code googleSpreadsheet.js
mpsido 1c1d78a
Removing hard url in app.js
mpsido d04c2cf
Refactoring, addRecentlyScanned function instead of logScanned
mpsido 9d8e1c8
Merge master
mpsido 12229de
Fixing pre-commit lint warnings, and adding addQrImg function to items
mpsido 3cd5020
moving filterEmptyUuid and sortByFloor functions to attribute of matc…
mpsido d33e8d9
Removing deprecated similar items function
mpsido 9b0b9a6
Fixing qrList regression
mpsido e773185
Reintroducing cellRef
mpsido File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,25 @@ | ||
<% include ./partials/header %> | ||
<div class="resultContainer col-xs-12"> | ||
<h1>Recently scanned QR code</h1> | ||
<article class="col-xs-12"> | ||
<ul class='recent-list'> | ||
<% for(var i = 0; i <allScans.length; i++){%> | ||
<% if(allScans[i].fixture) { %> | ||
<li> | ||
<a href="/<%- allScans[i].uuid %>"><%- allScans[i].time.toTimeString() %> - <%- allScans[i].fixture %> </a> :<br/> | ||
<%- allScans[i].uuid %> | ||
</li> | ||
<h1>Recently scanned QR codes</h1> | ||
<article class="col-xs-12"> | ||
<ul class='recent-list'> | ||
<% for (let item of allScans.values()) { %> | ||
<li> | ||
<%- item.time.toTimeString() %> - | ||
<% if (item.fixture) { %> | ||
<%- item.fixture %> | ||
<% } else { %> | ||
<li> | ||
<a href="/<%- allScans[i].uuid %>"><%- allScans[i].time.toTimeString() %> | ||
</a> | ||
<span style="color:<%- allScans[i].status==='fixed'?'orange':'red'%>" > | ||
:<br/> | ||
<%- allScans[i].uuid %> | ||
</span> | ||
</li> | ||
<%}%> | ||
<%}%> | ||
</ul> | ||
</article> | ||
</div> | ||
??? | ||
<% } %> | ||
: <br/> | ||
<a href="/<%- item.uuid %>"><%- item.uuid %></a> | ||
<% if (!item.fixture) { %> | ||
<a href="<%- item.link %>" style="color: <%- item.status === 'fixed' ? 'orange' : 'red' %>">Missing Details!</a> | ||
<% } %> | ||
<% if (item.duplicated) { %> | ||
<a href="<%- item.link %>" style="color: red">Duplicate UUID!</a> | ||
<% } %> | ||
</li> | ||
<% } %> | ||
</ul> | ||
</article> | ||
<% include ./partials/footer %> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because I want to avoid repetitions in the "recent" page.
I want to add one by one unique items on that page
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not the way to handle changes and features. We create an issue, discuss it and push it.
Hidding secret features in unrelated commits is not appropriate decision workflow and distracting for code review