Skip to content

ticket/035-handle-business-clicks #41

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

Merged
Steppschuh merged 1 commit into from
Mar 2, 2017
Merged

ticket/035-handle-business-clicks #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 2 additions & 10 deletions IntelliQ/backend/datastore/datastore-indexes-auto.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
<!-- Indices written at Tue, 28 Feb 2017 21:19:25 CET -->
<!-- Indices written at Tue, 28 Feb 2017 22:17:23 CET -->

<datastore-indexes>
<datastore-indexes/>

<!-- Used 2 times in query history -->
<datastore-index kind="PermissionEntry" ancestor="false" source="auto">
<property name="subjectKeyId" direction="asc"/>
<property name="userKeyId" direction="asc"/>
<property name="permission" direction="desc"/>
</datastore-index>

</datastore-indexes>
Binary file modified IntelliQ/backend/datastore/local_db.bin
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions IntelliQ/backend/src/main/webapp/static/js/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ var intelliqApi = function(){
api.PAGE_LINK_WEB_APP = api.PAGE_LINK + "apps/web/";
api.PAGE_LINK_WEB_APP_NEARBY = api.PAGE_LINK_WEB_APP + "nearby/";
api.PAGE_LINK_WEB_APP_QUEUE = api.PAGE_LINK_WEB_APP + "queue/";
api.PAGE_LINK_WEB_APP_BUSINESS = api.PAGE_LINK_WEB_APP + "business/";
api.PAGE_LINK_WEB_APP_TICKETS = api.PAGE_LINK_WEB_APP + "tickets/";

api.PATH_BUSINESS = "business/";
Expand Down Expand Up @@ -942,6 +943,11 @@ var intelliqApi = function(){
return urls.replaceParameter("businessKeyId", business.key.id, url);
}

urls.openInWebApp = function() {
var url = api.PAGE_LINK_WEB_APP_BUSINESS;
return urls.replaceParameter("businessKeyId", business.key.id, url);
}

return urls;
}

Expand Down
21 changes: 20 additions & 1 deletion IntelliQ/backend/src/main/webapp/static/js/ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,26 @@ var ui = function(){

card.withImageRatio(3/1);

card.withContent().withTitle(business.name, false);
var url = intelliqApi.getUrls().forBusiness(business).openInWebApp();
var title = $("<a>", {
"href": url,
"class": "truncate"
}).text(business.name);

if (business.queues.length == 1) {
// directly navigate to only queue available
var queue = business.queues[0];
var url = intelliqApi.getUrls().forQueue(queue).openInWebApp();
title.attr("href", url);
} else {
// don't actually navigate, show toast instead
title.click(function(event) {
event.preventDefault();
Materialize.toast(getString("selectQueue"), 3000);
});
}

card.withContent().withTitle(title, false);
return card;
}

Expand Down
2 changes: 2 additions & 0 deletions IntelliQ/backend/src/main/webapp/website/includes/en/common_head.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
"uploadSuccessful": "Upload Finished",
"uploadFailed": "Upload Failed",

"selectQueue": "Select a queue",

"status": "Status",
"statusWaiting": "Waiting",
"statusCalled": "Called",
Expand Down