avoid counting view ticket refresh as a new view

Author: car031

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/TicketDialog.java

@@ -31,9 +31,11 @@
  */
 public class TicketDialog extends Window {
 
-	private static final String ACTION2 = "action";
+	private static final String MAXVIEWS = "maxviews";
 
-	private static final String MAXDOWNLOADS2 = "maxdownloads";
+	private static final String ACTION = "action";
+
+	private static final String MAXDOWNLOADS = "maxdownloads";
 
 	private static final String CONTENT = "content";
 
@@ -67,19 +69,6 @@ public TicketDialog(GUIDocument document) {
 		layout.addMember(form);
 		layout.addMember(save);
 
-		addCloseClickHandler(event -> DocumentService.Instance.get().cleanUploadedFileFolder(new AsyncCallback<Void>() {
-
-			@Override
-			public void onFailure(Throwable caught) {
-				GuiLog.serverError(caught);
-			}
-
-			@Override
-			public void onSuccess(Void result) {
-				destroy();
-			}
-		}));
-
 		addItem(layout);
 	}
 
@@ -101,7 +90,7 @@ private void prepareForm() {
 		date.setColSpan(4);
 		date.setWrapTitle(false);
 
-		SpinnerItem maxDownloads = ItemFactory.newSpinnerItem(MAXDOWNLOADS2, (Integer) null);
+		SpinnerItem maxDownloads = ItemFactory.newSpinnerItem(MAXDOWNLOADS, (Integer) null);
 		maxDownloads.setEndRow(true);
 		maxDownloads.setColSpan(4);
 		maxDownloads.setWrapTitle(false);
@@ -119,7 +108,7 @@ private void prepareForm() {
 		duedateTime.setValueMap(map);
 		duedateTime.setValue("hour");
 
-		SelectItem action = ItemFactory.newSelectItem(ACTION2);
+		SelectItem action = ItemFactory.newSelectItem(ACTION);
 		action.setEndRow(true);
 		action.setColSpan(4);
 		action.setWrapTitle(false);
@@ -130,13 +119,13 @@ private void prepareForm() {
 		action.setValue("0");
 		action.setVisible(Feature.enabled(Feature.VIEW_TICKET));
 
-		SpinnerItem maxViews = ItemFactory.newSpinnerItem("maxviews", (Integer) null);
+		SpinnerItem maxViews = ItemFactory.newSpinnerItem(MAXVIEWS, (Integer) null);
 		maxViews.setEndRow(true);
 		maxViews.setColSpan(4);
 		maxViews.setWrapTitle(false);
 		maxViews.setRequired(false);
 		maxViews.setMin(0);
-		maxViews.setVisibleWhen(new AdvancedCriteria(ACTION2, OperatorId.EQUALS, "2"));
+		maxViews.setVisibleWhen(new AdvancedCriteria(ACTION, OperatorId.EQUALS, "2"));
 
 		form.setItems(action, docOrPdfConversion, duedateTimeItem, duedateTime, date, maxDownloads, maxViews);
 	}
@@ -158,17 +147,17 @@ public void onSave() {
 			SC.warn(I18N.message("providexepinfo"));
 
 		Integer maxDownloads = null;
-		String val = form.getValueAsString(MAXDOWNLOADS2);
+		String val = form.getValueAsString(MAXDOWNLOADS);
 		if (val != null && !val.trim().isEmpty())
 			maxDownloads = Integer.parseInt(val.trim());
 
 		Integer maxViews = null;
-		val = form.getValueAsString(MAXDOWNLOADS2);
+		val = form.getValueAsString(MAXVIEWS);
 		if (val != null && !val.trim().isEmpty())
 			maxViews = Integer.parseInt(val.trim());
 
 		DocumentService.Instance.get().createDownloadTicket(document.getId(),
-				Integer.parseInt(form.getValueAsString(ACTION2)), suffix, expireHours, date, maxDownloads, maxViews,
+				Integer.parseInt(form.getValueAsString(ACTION)), suffix, expireHours, date, maxDownloads, maxViews,
 				new AsyncCallback<String[]>() {
 
 					@Override

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/reports/TicketsReport.java

@@ -17,10 +17,10 @@
 import com.logicaldoc.gui.common.client.widgets.grid.RefreshableListGrid;
 import com.logicaldoc.gui.common.client.widgets.preview.PreviewPopup;
 import com.logicaldoc.gui.frontend.client.document.DocumentsPanel;
+import com.logicaldoc.gui.frontend.client.document.TicketDisplay;
 import com.logicaldoc.gui.frontend.client.services.DocumentService;
 import com.smartgwt.client.types.Alignment;
 import com.smartgwt.client.types.ListGridFieldType;
-import com.smartgwt.client.util.SC;
 import com.smartgwt.client.widgets.form.fields.SpinnerItem;
 import com.smartgwt.client.widgets.grid.ListGridField;
 import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -187,17 +187,10 @@ public void onSuccess(GUIDocument doc) {
 		ticketURL.setTitle(I18N.message("ticketurl"));
 		ticketURL.addClickHandler((MenuItemClickEvent event) -> {
 			String ticketId = rec.getAttributeAsString("ticketId");
+			String type = rec.getAttributeAsString("type");
 
-			String url = Session.get().getConfig("server.url");
-			if (!url.endsWith("/"))
-				url += "/";
-			if ("2".equals(rec.getAttributeAsString("type")))
-				url += "view/" + ticketId;
-			else
-				url += "download-ticket?ticketId=" + ticketId;
-
-			SC.confirm(I18N.message("downloadticket") + " - " + ticketId,
-					"<a href='" + url + "' target='_blank'>" + url + "</a>", null);
+			new TicketDisplay(ticketId, sampleTicketUrl(Session.get().getConfig("server.url"), ticketId, type),
+					sampleTicketUrl(Util.contextPath(), ticketId, type)).show();
 		});
 
 		MenuItem openInFolder = new MenuItem();
@@ -276,4 +269,14 @@ public void onSuccess(Void result) {
 			contextMenu.setItems(enable, ticketURL, download, preview, openInFolder, delete);
 		contextMenu.showContextMenu();
 	}
+
+	private String sampleTicketUrl(String urlBase, String ticketId, String type) {
+		if (!urlBase.endsWith("/"))
+			urlBase += "/";
+		if ("2".equals(type))
+			urlBase += "view/" + ticketId;
+		else
+			urlBase += "download-ticket?ticketId=" + ticketId;
+		return urlBase;
+	}
 }

logicaldoc-gui/war/prev/index.jsp

@@ -54,7 +54,7 @@
   if(request.getParameter("path")!=null)
   	path = request.getParameter("path");
   if(ticket!=null)
-  path = "download-ticket";
+  	path = "download-ticket";
   
   String query = request.getQueryString();
   if(previewCheck!=null)

logicaldoc-i18n/src/main/resources/i18n/messages.properties

@@ -2965,6 +2965,7 @@ indexable = Indexable
 metadata = metadata
 all = all
 view = View
+views = Views
 maxviews = Max views
 tickets = Tickets
 thisticketdisabled = This ticket has been disabled

logicaldoc-i18n/src/main/resources/i18n/messages_en.properties

@@ -2965,6 +2965,7 @@ indexable = Indexable
 metadata = metadata
 all = all
 view = View
+views = Views
 maxviews = Max views
 tickets = Tickets
 thisticketdisabled = This ticket has been disabled

logicaldoc-i18n/src/main/resources/i18n/messages_en_US.properties

@@ -2965,6 +2965,7 @@ indexable = Indexable
 metadata = metadata
 all = all
 view = View
+views = Views
 maxviews = Max views
 tickets = Tickets
 thisticketdisabled = This ticket has been disabled

logicaldoc-webapp/src/main/java/com/logicaldoc/web/TicketDownload.java

@@ -81,7 +81,17 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) {
 
 			if (isPreviewDownload(ticketId, request, document)) {
 				request.getSession().removeAttribute(getPreviewAttributeName(ticketId));
-				ticket.setViews(ticket.getViews() + 1);
+
+				/**
+				 * The user may resize the view panel that will trigger a reload
+				 * so we must mark the read in the session and count it just the
+				 * first time
+				 */
+				String viewMarker = "ticketviewed-" + ticketId;
+				if (request.getSession().getAttribute(viewMarker) == null) {
+					ticket.setViews(ticket.getViews() + 1);
+					request.getSession().setAttribute(viewMarker, true);
+				}
 				if (isHtml(document))
 					suffix = "safe.html";
 			} else {