From c1faf5f4c95a2e3b43e65e84880b6d12f9067925 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Thu, 28 Jan 2016 21:03:07 +0000 Subject: Add server-side sorting, filtering, and pagination for available, making use of tablesorter in the HTML view --- apk-available-html.lsp | 126 +++++++++++++++++++++++++++++++++++++++---------- apk-controller.lua | 4 +- apk-model.lua | 75 +++++++++++++++++++++++++++-- 3 files changed, 174 insertions(+), 31 deletions(-) diff --git a/apk-available-html.lsp b/apk-available-html.lsp index 3872667..bcf109f 100644 --- a/apk-available-html.lsp +++ b/apk-available-html.lsp @@ -11,12 +11,93 @@ @@ -25,33 +106,30 @@ <% local header_level = htmlviewfunctions.displaysectionstart(form, page_info) %> - <% if viewlibrary.check_permission("install") or viewlibrary.check_permission("upgrade") then %> - + <% if viewlibrary.check_permission("install") or viewlibrary.check_permission("upgrade") or viewlibrary.check_permission("details") then %> + <% end %> -<% local packagecfe = cfe({ type="hidden", value="" }) %> -<% for i,packagetable in pairs(form.value) do %> - - <% if viewlibrary.check_permission("install") or viewlibrary.check_permission("upgrade") or viewlibrary.check_permission("details") then %> - <% packagecfe.value = packagetable.name %> - - <% end %> - - - -<% end %>
ActionActionPackage Name Version
- <% if viewlibrary.check_permission("install") and not packagetable.upgrade then %> - <% htmlviewfunctions.displayitem(cfe({type="form", value={package=packagecfe}, label="", option="Install", action="install" }), page_info, -1) %> - <% end %> - <% if viewlibrary.check_permission("upgrade") and packagetable.upgrade then %> - <% htmlviewfunctions.displayitem(cfe({type="form", value={package=packagecfe}, label="", option="Upgrade", action="upgrade" }), page_info, -1) %> - <% end %> - <% if viewlibrary.check_permission("details") then %> - <% htmlviewfunctions.displayitem(cfe({type="form", value={package=packagecfe}, label="", option="View", action="details" }), page_info, -1) %> - <% end %> - <%= html.html_escape(packagetable.name) %><%= html.html_escape(packagetable.version) %>
+ +
+
+ Page: + + + + + + +
+
+ <% htmlviewfunctions.displaysectionend(header_level) %> diff --git a/apk-controller.lua b/apk-controller.lua index 70e82bf..674742a 100644 --- a/apk-controller.lua +++ b/apk-controller.lua @@ -4,11 +4,11 @@ local mymodule = {} mymodule.default_action = "loaded" mymodule.loaded = function(self) - return self.model.get_loaded_packages() + return self.model.get_loaded_packages(self, self.clientdata) end mymodule.available = function(self) - return self.model.get_available_packages() + return self.model.get_available_packages(self, self.clientdata) end mymodule.details = function(self) diff --git a/apk-model.lua b/apk-model.lua index f44e78d..e2626ce 100644 --- a/apk-model.lua +++ b/apk-model.lua @@ -172,21 +172,86 @@ mymodule.get_loaded_packages = function() return cfe({ type="group", value={toplevel=top, dependent=depend}, label="Installed Packages" }) end -mymodule.get_available_packages = function() +mymodule.get_available_packages = function(self, clientdata) repo = repository() -- available are all except same version installed - local available = cfe({ type="list", value={}, label="Available Packages" }) + local retval = cfe({ type="group", value={}, label="Available Packages" }) + retval.value.page = cfe({ value=0, label="Page Number", descr="0 indicates ALL", key=true }) + retval.value.pagesize = cfe({ value=10, label="Page Size", key=true }) + retval.value.rowcount = cfe({ value=0, label="Row Count" }) + -- orderby must be an array of tables with column name and direction + retval.value.orderby = cfe({ type="structure", value={{column="name", direction="asc"}}, label="Order By", key=true }) + -- filter is a table with a string filter for each column + retval.value.filter = cfe({ type="structure", value={name="", version=""}, label="Filter", key=true }) + self.handle_clientdata(retval, clientdata) + retval.value.result = cfe({ type="structure", value={}, label="Available Packages" }) + + -- Process the incoming page data + local page = tonumber(retval.value.page.value) or 0 + retval.value.page.value = page + local pagesize = tonumber(retval.value.pagesize.value) or 10 + retval.value.pagesize.value = pagesize + + local available = {} for name,value in pairs(repo) do if value.version and (not value.installed or value.upgrade) then local temp = {} temp.name = name temp.version = value.version temp.upgrade = value.upgrade - available.value[#available.value + 1] = temp + + -- Filter + for c,f in pairs(retval.value.filter.value) do + if temp[c] and f ~= "" and not string.find(temp[c], format.escapemagiccharacters(f)) then + temp = nil + break + end + end + + available[#available + 1] = temp + end + end + + -- Sort + if #available > 0 then + local function createsort(column, descending, equal) + return function(a,b) + if a[column] == b[column] then + return equal(a,b) + end + if descending then + return tostring(a[column]) > tostring(b[column]) + end + return tostring(a[column]) < tostring(b[column]) + end end + local sortfunction = function(a,b) return false end + if #retval.value.orderby.value == 0 then + sortfunction = createsort("name", true, sortfunction) + else + local columns = {name=true, version=true, upgrade=true} + local directions = {desc=true, DESC=true} + for i=#retval.value.orderby.value,1,-1 do + local orderby = retval.value.orderby.value[i] + if columns[orderby.column] then + sortfunction = createsort(orderby.column, directions[orderby.direction], sortfunction) + end + end + end + table.sort(available, sortfunction) + end + + -- Paginate + retval.value.rowcount.value = #available + if page > 0 then + for i=((page-1)*pagesize+1), (page*pagesize) do + retval.value.result.value[#retval.value.result.value+1] = available[i] + end + else + retval.value.result.value = available end - table.sort(available.value, function(a,b) return (a.name < b.name) end) - return available + + return retval end mymodule.get_delete_package = function(self, clientdata) -- cgit v1.2.3