Blank root panel, asset form as a modal, and a dedicated Statuses page

- Main panel is now blank at the top level ("Select a folder or asset
  from the tree") instead of showing a dashboard - browsing happens in
  the tree, the panel only shows something once you click into it.
  Removed the now-dead DashboardStats/Stats() machinery it depended on.
- Add/Edit Asset no longer takes over the main panel; it opens in
  #assetModal instead; asset_form.html was trimmed down to just the form
  (no more breadcrumb/panel wrapper) since the modal chrome provides the
  title and footer buttons now. The dynamic item-type-fields and submit
  listeners moved from #main-panel's delegation to the modal element's.
- Statuses split out of the General settings page into its own
  /settings/statuses page and sub-nav entry, alongside General, Item
  Types, and Users.
This commit is contained in:
Owen
2026-08-17 15:45:38 -05:00
parent 4d7ebed68e
commit 8d9106542c
12 changed files with 254 additions and 436 deletions
-81
View File
@@ -466,84 +466,3 @@ func (s *Store) descendantFolderIDs(ctx context.Context, rootID int64) ([]int64,
walk(rootID) walk(rootID)
return out, nil return out, nil
} }
// DashboardStats summarizes inventory counts for the small dashboard.
type DashboardStats struct {
Total int
ByStatus []StatusCount
ByType []TypeCount
RecentlyAdded []models.Asset
}
type StatusCount struct {
Name string
Color string
Count int
}
type TypeCount struct {
Name string
Icon string
Count int
}
func (s *Store) Stats(ctx context.Context) (*DashboardStats, error) {
stats := &DashboardStats{}
if err := s.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM assets`).Scan(&stats.Total); err != nil {
return nil, err
}
rows, err := s.db.QueryContext(ctx, `
SELECT st.name, st.color, COUNT(a.id)
FROM statuses st LEFT JOIN assets a ON a.status_id = st.id
GROUP BY st.id ORDER BY st.sort_order ASC`)
if err != nil {
return nil, err
}
for rows.Next() {
var sc StatusCount
if err := rows.Scan(&sc.Name, &sc.Color, &sc.Count); err != nil {
rows.Close()
return nil, err
}
stats.ByStatus = append(stats.ByStatus, sc)
}
rows.Close()
if err := rows.Err(); err != nil {
return nil, err
}
rows, err = s.db.QueryContext(ctx, `
SELECT it.name, it.icon, COUNT(a.id)
FROM item_types it LEFT JOIN assets a ON a.item_type_id = it.id
GROUP BY it.id HAVING COUNT(a.id) > 0 ORDER BY COUNT(a.id) DESC`)
if err != nil {
return nil, err
}
for rows.Next() {
var tc TypeCount
if err := rows.Scan(&tc.Name, &tc.Icon, &tc.Count); err != nil {
rows.Close()
return nil, err
}
stats.ByType = append(stats.ByType, tc)
}
rows.Close()
if err := rows.Err(); err != nil {
return nil, err
}
recentRows, err := s.db.QueryContext(ctx, assetSelect+` ORDER BY a.created_at DESC LIMIT 8`)
if err != nil {
return nil, err
}
defer recentRows.Close()
for recentRows.Next() {
a, err := scanAsset(recentRows)
if err != nil {
return nil, err
}
stats.RecentlyAdded = append(stats.RecentlyAdded, *a)
}
return stats, recentRows.Err()
}
+7 -40
View File
@@ -1,7 +1,6 @@
package web package web
import ( import (
"context"
"net/http" "net/http"
"inventree/internal/assets" "inventree/internal/assets"
@@ -12,7 +11,6 @@ import (
type InventoryPageData struct { type InventoryPageData struct {
User *models.User User *models.User
Tree []models.TreeNode Tree []models.TreeNode
Root *RootPanelData
ItemTypes []models.ItemType ItemTypes []models.ItemType
Statuses []models.Status Statuses []models.Status
} }
@@ -31,11 +29,6 @@ func (a *App) handleInventoryPage(w http.ResponseWriter, r *http.Request) {
writeErr(w, http.StatusInternalServerError, err.Error()) writeErr(w, http.StatusInternalServerError, err.Error())
return return
} }
root, err := a.rootPanelData(ctx)
if err != nil {
writeErr(w, http.StatusInternalServerError, err.Error())
return
}
itemTypes, err := a.ItemTypes.List(ctx, false) itemTypes, err := a.ItemTypes.List(ctx, false)
if err != nil { if err != nil {
writeErr(w, http.StatusInternalServerError, err.Error()) writeErr(w, http.StatusInternalServerError, err.Error())
@@ -48,7 +41,7 @@ func (a *App) handleInventoryPage(w http.ResponseWriter, r *http.Request) {
} }
a.Render(w, http.StatusOK, "inventory", InventoryPageData{ a.Render(w, http.StatusOK, "inventory", InventoryPageData{
User: u, Tree: tree, Root: root, ItemTypes: itemTypes, Statuses: statusList, User: u, Tree: tree, ItemTypes: itemTypes, Statuses: statusList,
}) })
} }
@@ -112,39 +105,13 @@ func (a *App) handleTreeCollapseAll(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusNoContent) w.WriteHeader(http.StatusNoContent)
} }
// RootPanelData backs the main panel when nothing is selected: the virtual // handlePanelRoot backs the main panel when nothing is selected. It is
// "Inventory" root, showing top-level folders, unfiled assets, and the // intentionally blank (no dashboard/summary) - the panel only shows
// small dashboard. // something once a folder or asset is actually clicked; browsing happens
type RootPanelData struct { // in the tree. The fragment still carries a data-panel-type="root" hook so
Folders []models.Folder // right-click still offers "New Folder" / "Add Asset" / import / export.
UnfiledAssets []models.Asset
UnfiledTotal int
Stats *assets.DashboardStats
}
func (a *App) rootPanelData(ctx context.Context) (*RootPanelData, error) {
folderList, err := a.Folders.Children(ctx, nil)
if err != nil {
return nil, err
}
unfiled, total, err := a.Assets.List(ctx, assets.ListFilter{FolderSet: true, FolderID: nil, Page: 1, PageSize: 50})
if err != nil {
return nil, err
}
stats, err := a.Assets.Stats(ctx)
if err != nil {
return nil, err
}
return &RootPanelData{Folders: folderList, UnfiledAssets: unfiled, UnfiledTotal: total, Stats: stats}, nil
}
func (a *App) handlePanelRoot(w http.ResponseWriter, r *http.Request) { func (a *App) handlePanelRoot(w http.ResponseWriter, r *http.Request) {
data, err := a.rootPanelData(r.Context()) a.RenderFragment(w, http.StatusOK, "panel_root", nil)
if err != nil {
writeErr(w, http.StatusInternalServerError, err.Error())
return
}
a.RenderFragment(w, http.StatusOK, "panel_root", data)
} }
// FolderPanelData backs the main panel when a folder is selected. // FolderPanelData backs the main panel when a folder is selected.
+33 -30
View File
@@ -9,43 +9,32 @@ import (
type settingsPageData struct { type settingsPageData struct {
User *models.User User *models.User
Statuses []models.Status
SiteName string SiteName string
AssetPrefix string AssetPrefix string
AssetPadding string AssetPadding string
Error string Error string
} }
func (a *App) settingsData(r *http.Request) (settingsPageData, error) {
ctx := r.Context()
statusList, err := a.Statuses.List(ctx)
if err != nil {
return settingsPageData{}, err
}
siteName, err := a.Settings.Get(ctx, "site_name", "inventree")
if err != nil {
return settingsPageData{}, err
}
prefix, err := a.Settings.Get(ctx, "asset_id_prefix", "IT-")
if err != nil {
return settingsPageData{}, err
}
padding, err := a.Settings.Get(ctx, "asset_id_padding", "6")
if err != nil {
return settingsPageData{}, err
}
return settingsPageData{
User: currentUser(r), Statuses: statusList, SiteName: siteName, AssetPrefix: prefix, AssetPadding: padding,
}, nil
}
func (a *App) handleSettingsPage(w http.ResponseWriter, r *http.Request) { func (a *App) handleSettingsPage(w http.ResponseWriter, r *http.Request) {
data, err := a.settingsData(r) ctx := r.Context()
siteName, err := a.Settings.Get(ctx, "site_name", "inventree")
if err != nil { if err != nil {
writeErr(w, http.StatusInternalServerError, err.Error()) writeErr(w, http.StatusInternalServerError, err.Error())
return return
} }
a.Render(w, http.StatusOK, "settings", data) prefix, err := a.Settings.Get(ctx, "asset_id_prefix", "IT-")
if err != nil {
writeErr(w, http.StatusInternalServerError, err.Error())
return
}
padding, err := a.Settings.Get(ctx, "asset_id_padding", "6")
if err != nil {
writeErr(w, http.StatusInternalServerError, err.Error())
return
}
a.Render(w, http.StatusOK, "settings", settingsPageData{
User: currentUser(r), SiteName: siteName, AssetPrefix: prefix, AssetPadding: padding,
})
} }
func (a *App) handleSettingsGeneral(w http.ResponseWriter, r *http.Request) { func (a *App) handleSettingsGeneral(w http.ResponseWriter, r *http.Request) {
@@ -62,6 +51,20 @@ func (a *App) handleSettingsGeneral(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, "/settings", http.StatusSeeOther) http.Redirect(w, r, "/settings", http.StatusSeeOther)
} }
type statusesPageData struct {
User *models.User
Statuses []models.Status
}
func (a *App) handleSettingsStatusesPage(w http.ResponseWriter, r *http.Request) {
statusList, err := a.Statuses.List(r.Context())
if err != nil {
writeErr(w, http.StatusInternalServerError, err.Error())
return
}
a.Render(w, http.StatusOK, "settings_statuses", statusesPageData{User: currentUser(r), Statuses: statusList})
}
func (a *App) handleStatusCreate(w http.ResponseWriter, r *http.Request) { func (a *App) handleStatusCreate(w http.ResponseWriter, r *http.Request) {
if err := r.ParseForm(); err != nil { if err := r.ParseForm(); err != nil {
writeErr(w, http.StatusBadRequest, err.Error()) writeErr(w, http.StatusBadRequest, err.Error())
@@ -71,7 +74,7 @@ func (a *App) handleStatusCreate(w http.ResponseWriter, r *http.Request) {
if err := a.Statuses.Create(r.Context(), st); err != nil { if err := a.Statuses.Create(r.Context(), st); err != nil {
a.Log.Warn("create status failed", "error", err) a.Log.Warn("create status failed", "error", err)
} }
http.Redirect(w, r, "/settings", http.StatusSeeOther) http.Redirect(w, r, "/settings/statuses", http.StatusSeeOther)
} }
func (a *App) handleStatusUpdate(w http.ResponseWriter, r *http.Request) { func (a *App) handleStatusUpdate(w http.ResponseWriter, r *http.Request) {
@@ -94,7 +97,7 @@ func (a *App) handleStatusUpdate(w http.ResponseWriter, r *http.Request) {
if err := a.Statuses.Update(r.Context(), st); err != nil { if err := a.Statuses.Update(r.Context(), st); err != nil {
a.Log.Warn("update status failed", "error", err) a.Log.Warn("update status failed", "error", err)
} }
http.Redirect(w, r, "/settings", http.StatusSeeOther) http.Redirect(w, r, "/settings/statuses", http.StatusSeeOther)
} }
func (a *App) handleStatusDelete(w http.ResponseWriter, r *http.Request) { func (a *App) handleStatusDelete(w http.ResponseWriter, r *http.Request) {
@@ -106,7 +109,7 @@ func (a *App) handleStatusDelete(w http.ResponseWriter, r *http.Request) {
if err := a.Statuses.Delete(r.Context(), id); err != nil { if err := a.Statuses.Delete(r.Context(), id); err != nil {
a.Log.Warn("delete status failed", "error", err) a.Log.Warn("delete status failed", "error", err)
} }
http.Redirect(w, r, "/settings", http.StatusSeeOther) http.Redirect(w, r, "/settings/statuses", http.StatusSeeOther)
} }
func (a *App) handleStatusReorder(w http.ResponseWriter, r *http.Request) { func (a *App) handleStatusReorder(w http.ResponseWriter, r *http.Request) {
@@ -152,5 +155,5 @@ func (a *App) handleStatusReorder(w http.ResponseWriter, r *http.Request) {
} }
} }
} }
http.Redirect(w, r, "/settings", http.StatusSeeOther) http.Redirect(w, r, "/settings/statuses", http.StatusSeeOther)
} }
+1
View File
@@ -64,6 +64,7 @@ func (a *App) Router() http.Handler {
// sub-navigation, rather than as separate top-level nav items. // sub-navigation, rather than as separate top-level nav items.
mux.HandleFunc("GET /settings", a.requireAdmin(a.handleSettingsPage)) mux.HandleFunc("GET /settings", a.requireAdmin(a.handleSettingsPage))
mux.HandleFunc("POST /settings/general", a.requireAdmin(a.handleSettingsGeneral)) mux.HandleFunc("POST /settings/general", a.requireAdmin(a.handleSettingsGeneral))
mux.HandleFunc("GET /settings/statuses", a.requireAdmin(a.handleSettingsStatusesPage))
mux.HandleFunc("POST /settings/statuses", a.requireAdmin(a.handleStatusCreate)) mux.HandleFunc("POST /settings/statuses", a.requireAdmin(a.handleStatusCreate))
mux.HandleFunc("POST /settings/statuses/{id}", a.requireAdmin(a.handleStatusUpdate)) mux.HandleFunc("POST /settings/statuses/{id}", a.requireAdmin(a.handleStatusUpdate))
mux.HandleFunc("POST /settings/statuses/{id}/delete", a.requireAdmin(a.handleStatusDelete)) mux.HandleFunc("POST /settings/statuses/{id}/delete", a.requireAdmin(a.handleStatusDelete))
+36 -32
View File
@@ -14,7 +14,6 @@
var mainPanel = document.getElementById('main-panel'); var mainPanel = document.getElementById('main-panel');
var isAdmin = document.body.classList.contains('role-admin'); var isAdmin = document.body.classList.contains('role-admin');
var draggedNode = null; var draggedNode = null;
var formReturnContext = { type: 'root', id: '' };
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Generic helpers // Generic helpers
@@ -514,33 +513,32 @@
} }
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Asset form (create / edit) // Asset form (create / edit) - shown in a modal
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
var assetModalEl = document.getElementById('assetModal');
var assetModal = (assetModalEl && window.bootstrap) ? new bootstrap.Modal(assetModalEl) : null;
function showAssetModal(html) {
if (!assetModal) return;
document.getElementById('assetModalBody').innerHTML = html;
var form = document.getElementById('assetForm');
document.getElementById('assetModalTitle').textContent = form.dataset.title;
document.getElementById('assetModalSubmit').textContent = form.dataset.mode === 'edit' ? 'Save Changes' : 'Create Asset';
assetModal.show();
}
async function loadAssetForm(opts) { async function loadAssetForm(opts) {
formReturnContext = { type: mainPanel.dataset.contextType || 'root', id: mainPanel.dataset.contextId || '' };
var params = new URLSearchParams(); var params = new URLSearchParams();
if (opts && opts.folderId) params.set('folder_id', opts.folderId); if (opts && opts.folderId) params.set('folder_id', opts.folderId);
var qs = params.toString(); var qs = params.toString();
var html = await fetchText('/app/panel/assets/new' + (qs ? '?' + qs : '')); var html = await fetchText('/app/panel/assets/new' + (qs ? '?' + qs : ''));
mainPanel.innerHTML = html; showAssetModal(html);
mainPanel.dataset.contextType = 'asset-form';
mainPanel.dataset.contextId = '';
} }
async function loadAssetEditForm(id) { async function loadAssetEditForm(id) {
var html = await fetchText('/app/panel/assets/' + id + '/edit'); var html = await fetchText('/app/panel/assets/' + id + '/edit');
mainPanel.innerHTML = html; showAssetModal(html);
mainPanel.dataset.contextType = 'asset-form';
mainPanel.dataset.contextId = id;
}
function cancelAssetForm(btn) {
if (btn.dataset.id) {
navigateAndSelect('asset', btn.dataset.id);
} else {
navigateAndSelect(formReturnContext.type, formReturnContext.id);
}
} }
async function submitAssetForm(form) { async function submitAssetForm(form) {
@@ -569,6 +567,7 @@
var method = mode === 'edit' ? 'PATCH' : 'POST'; var method = mode === 'edit' ? 'PATCH' : 'POST';
try { try {
var res = await apiFetch(url, { method: method, json: payload }); var res = await apiFetch(url, { method: method, json: payload });
if (assetModal) assetModal.hide();
await refreshWholeTree(); await refreshWholeTree();
await navigateAndSelect('asset', res.id); await navigateAndSelect('asset', res.id);
} catch (err) { } catch (err) {
@@ -779,18 +778,9 @@
var pageLink = e.target.closest('.panel-page-link'); var pageLink = e.target.closest('.panel-page-link');
if (pageLink) { e.preventDefault(); loadFolderPanelWithFilters(pageLink.dataset.folderId, { page: pageLink.dataset.page }); return; } if (pageLink) { e.preventDefault(); loadFolderPanelWithFilters(pageLink.dataset.folderId, { page: pageLink.dataset.page }); return; }
var cancelFormBtn = e.target.closest('[data-action="cancel-asset-form"]');
if (cancelFormBtn) { cancelAssetForm(cancelFormBtn); return; }
}); });
mainPanel.addEventListener('change', async function (e) { mainPanel.addEventListener('change', function (e) {
if (e.target.id === 'assetFormItemType') {
var html = await fetchText('/app/forms/asset-fields?item_type_id=' + e.target.value);
var container = document.getElementById('asset-fields-container');
if (container) container.innerHTML = html;
return;
}
var filterForm = e.target.closest('.panel-filter-form'); var filterForm = e.target.closest('.panel-filter-form');
if (filterForm) { if (filterForm) {
loadFolderPanelWithFilters(filterForm.dataset.folderId, { page: 1 }); loadFolderPanelWithFilters(filterForm.dataset.folderId, { page: 1 });
@@ -810,11 +800,6 @@
if (e.target.matches && e.target.matches('.panel-filter-form')) { if (e.target.matches && e.target.matches('.panel-filter-form')) {
e.preventDefault(); e.preventDefault();
loadFolderPanelWithFilters(e.target.dataset.folderId, { page: 1 }); loadFolderPanelWithFilters(e.target.dataset.folderId, { page: 1 });
return;
}
if (e.target.id === 'assetForm') {
e.preventDefault();
submitAssetForm(e.target);
} }
}); });
@@ -822,6 +807,25 @@
// onto the tree only; the tree pane is the primary drag surface. // onto the tree only; the tree pane is the primary drag surface.
} }
// The asset create/edit form lives inside #assetModal (injected fresh
// each time it's opened), so its dynamic bits are delegated from the
// modal element itself rather than from #main-panel.
if (assetModalEl) {
assetModalEl.addEventListener('change', async function (e) {
if (e.target.id === 'assetFormItemType') {
var html = await fetchText('/app/forms/asset-fields?item_type_id=' + e.target.value);
var container = document.getElementById('asset-fields-container');
if (container) container.innerHTML = html;
}
});
assetModalEl.addEventListener('submit', function (e) {
if (e.target.id === 'assetForm') {
e.preventDefault();
submitAssetForm(e.target);
}
});
}
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Item type custom field admin form (item-types/{id}/edit page) // Item type custom field admin form (item-types/{id}/edit page)
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
+1 -1
View File
@@ -29,7 +29,7 @@
</aside> </aside>
<section id="main-panel" class="main-panel flex-fill overflow-auto" data-context-type="root" data-context-id=""> <section id="main-panel" class="main-panel flex-fill overflow-auto" data-context-type="root" data-context-id="">
{{template "panel_root" .Root}} {{template "panel_root" .}}
</section> </section>
</div> </div>
+1 -59
View File
@@ -7,7 +7,7 @@
</div> </div>
<div class="col-md-9 col-lg-10" style="max-width: 800px"> <div class="col-md-9 col-lg-10" style="max-width: 800px">
<div class="card mb-4"> <div class="card">
<div class="card-header py-2 fw-semibold">General</div> <div class="card-header py-2 fw-semibold">General</div>
<div class="card-body"> <div class="card-body">
<form method="post" action="/settings/general" class="row g-3"> <form method="post" action="/settings/general" class="row g-3">
@@ -30,64 +30,6 @@
</div> </div>
</div> </div>
<div class="card">
<div class="card-header py-2 fw-semibold">Statuses</div>
<div class="table-responsive">
<table class="table mb-0 align-middle">
<thead><tr><th>Order</th><th>Preview</th><th>Name &amp; Color</th><th></th></tr></thead>
<tbody>
{{range $i, $st := .Statuses}}
<tr>
<td class="text-nowrap">
<form method="post" action="/settings/statuses/{{$st.ID}}/reorder" class="d-inline">
<input type="hidden" name="dir" value="up">
<button type="submit" class="btn btn-sm btn-outline-secondary" {{if eq $i 0}}disabled{{end}}><i class="bi bi-arrow-up"></i></button>
</form>
<form method="post" action="/settings/statuses/{{$st.ID}}/reorder" class="d-inline">
<input type="hidden" name="dir" value="down">
<button type="submit" class="btn btn-sm btn-outline-secondary" {{if eq (add $i 1) (len $.Statuses)}}disabled{{end}}><i class="bi bi-arrow-down"></i></button>
</form>
</td>
<td><span class="badge text-bg-{{$st.Color}}">{{$st.Name}}</span></td>
<td>
<form method="post" action="/settings/statuses/{{$st.ID}}" class="d-flex gap-2 align-items-center">
<input type="text" class="form-control form-control-sm" name="name" value="{{$st.Name}}" style="max-width:160px" required>
<select class="form-select form-select-sm" name="color" style="max-width:130px">
{{range (list "primary" "secondary" "success" "danger" "warning" "info" "dark")}}
<option value="{{.}}" {{if eq . $st.Color}}selected{{end}}>{{.}}</option>
{{end}}
</select>
<button type="submit" class="btn btn-sm btn-outline-secondary">Save</button>
</form>
</td>
<td>
<form method="post" action="/settings/statuses/{{$st.ID}}/delete" onsubmit="return confirm('Delete this status?')">
<button type="submit" class="btn btn-sm btn-outline-danger">Delete</button>
</form>
</td>
</tr>
{{end}}
</tbody>
</table>
</div>
<div class="card-body border-top">
<h6>Add Status</h6>
<form method="post" action="/settings/statuses" class="d-flex gap-2 align-items-end">
<div>
<label class="form-label small mb-1">Name</label>
<input type="text" class="form-control form-control-sm" name="name" required>
</div>
<div>
<label class="form-label small mb-1">Color</label>
<select class="form-select form-select-sm" name="color">
{{range (list "primary" "secondary" "success" "danger" "warning" "info" "dark")}}<option value="{{.}}">{{.}}</option>{{end}}
</select>
</div>
<button type="submit" class="btn btn-sm btn-primary">Add</button>
</form>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -0,0 +1,71 @@
{{define "content"}}
<div class="container-fluid p-3">
<h4 class="mb-3">Settings</h4>
<div class="row g-3">
<div class="col-md-3 col-lg-2">
{{template "settings_nav" "statuses"}}
</div>
<div class="col-md-9 col-lg-10" style="max-width: 800px">
<div class="card">
<div class="card-header py-2 fw-semibold">Statuses</div>
<div class="table-responsive">
<table class="table mb-0 align-middle">
<thead><tr><th>Order</th><th>Preview</th><th>Name &amp; Color</th><th></th></tr></thead>
<tbody>
{{range $i, $st := .Statuses}}
<tr>
<td class="text-nowrap">
<form method="post" action="/settings/statuses/{{$st.ID}}/reorder" class="d-inline">
<input type="hidden" name="dir" value="up">
<button type="submit" class="btn btn-sm btn-outline-secondary" {{if eq $i 0}}disabled{{end}}><i class="bi bi-arrow-up"></i></button>
</form>
<form method="post" action="/settings/statuses/{{$st.ID}}/reorder" class="d-inline">
<input type="hidden" name="dir" value="down">
<button type="submit" class="btn btn-sm btn-outline-secondary" {{if eq (add $i 1) (len $.Statuses)}}disabled{{end}}><i class="bi bi-arrow-down"></i></button>
</form>
</td>
<td><span class="badge text-bg-{{$st.Color}}">{{$st.Name}}</span></td>
<td>
<form method="post" action="/settings/statuses/{{$st.ID}}" class="d-flex gap-2 align-items-center">
<input type="text" class="form-control form-control-sm" name="name" value="{{$st.Name}}" style="max-width:160px" required>
<select class="form-select form-select-sm" name="color" style="max-width:130px">
{{range (list "primary" "secondary" "success" "danger" "warning" "info" "dark")}}
<option value="{{.}}" {{if eq . $st.Color}}selected{{end}}>{{.}}</option>
{{end}}
</select>
<button type="submit" class="btn btn-sm btn-outline-secondary">Save</button>
</form>
</td>
<td>
<form method="post" action="/settings/statuses/{{$st.ID}}/delete" onsubmit="return confirm('Delete this status?')">
<button type="submit" class="btn btn-sm btn-outline-danger">Delete</button>
</form>
</td>
</tr>
{{end}}
</tbody>
</table>
</div>
<div class="card-body border-top">
<h6>Add Status</h6>
<form method="post" action="/settings/statuses" class="d-flex gap-2 align-items-end">
<div>
<label class="form-label small mb-1">Name</label>
<input type="text" class="form-control form-control-sm" name="name" required>
</div>
<div>
<label class="form-label small mb-1">Color</label>
<select class="form-select form-select-sm" name="color">
{{range (list "primary" "secondary" "success" "danger" "warning" "info" "dark")}}<option value="{{.}}">{{.}}</option>{{end}}
</select>
</div>
<button type="submit" class="btn btn-sm btn-primary">Add</button>
</form>
</div>
</div>
</div>
</div>
</div>
{{end}}
+2 -14
View File
@@ -1,13 +1,6 @@
{{define "asset_form"}} {{define "asset_form"}}
<div class="panel-content p-3"> <form id="assetForm" data-mode="{{if .Asset}}edit{{else}}create{{end}}" {{if .Asset}}data-asset-id="{{.Asset.ID}}"{{end}}
<nav aria-label="breadcrumb"> data-title="{{if .Asset}}Edit {{.Asset.Name}}{{else}}New Asset{{end}}">
<ol class="breadcrumb mb-2">
<li class="breadcrumb-item"><a href="#" class="breadcrumb-link" data-type="root">Inventory</a></li>
<li class="breadcrumb-item active">{{if .Asset}}Edit {{.Asset.Name}}{{else}}New Asset{{end}}</li>
</ol>
</nav>
<form id="assetForm" data-mode="{{if .Asset}}edit{{else}}create{{end}}" {{if .Asset}}data-asset-id="{{.Asset.ID}}"{{end}}>
<div class="row g-3"> <div class="row g-3">
<div class="col-md-6"> <div class="col-md-6">
<label class="form-label">Asset ID</label> <label class="form-label">Asset ID</label>
@@ -71,11 +64,6 @@
</div> </div>
</div> </div>
<div class="d-flex gap-2 mt-4">
<button type="submit" class="btn btn-primary">{{if .Asset}}Save Changes{{else}}Create Asset{{end}}</button>
<button type="button" class="btn btn-outline-secondary" data-action="cancel-asset-form" {{if .Asset}}data-id="{{.Asset.ID}}"{{end}}>Cancel</button>
</div>
<div class="alert alert-danger mt-3 d-none" id="assetFormError"></div> <div class="alert alert-danger mt-3 d-none" id="assetFormError"></div>
</form> </form>
</div>
{{end}} {{end}}
+17
View File
@@ -77,6 +77,23 @@
</div> </div>
</div> </div>
<!-- Add / edit asset -->
<div class="modal fade" id="assetModal" tabindex="-1">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="assetModalTitle">New Asset</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body" id="assetModalBody"></div>
<div class="modal-footer">
<button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Cancel</button>
<button type="submit" form="assetForm" class="btn btn-primary" id="assetModalSubmit">Create Asset</button>
</div>
</div>
</div>
</div>
<!-- Move asset --> <!-- Move asset -->
<div class="modal fade" id="moveAssetModal" tabindex="-1"> <div class="modal fade" id="moveAssetModal" tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
+2 -99
View File
@@ -1,102 +1,5 @@
{{define "panel_root"}} {{define "panel_root"}}
<div class="panel-content p-3" data-panel-type="root"> <div class="panel-content panel-blank p-3 h-100 d-flex align-items-center justify-content-center" data-panel-type="root">
<nav aria-label="breadcrumb"> <p class="text-body-secondary mb-0">Select a folder or asset from the tree.</p>
<ol class="breadcrumb mb-2">
<li class="breadcrumb-item active" aria-current="page" data-type="root">Inventory</li>
</ol>
</nav>
<div class="row g-2 mb-3">
<div class="col-6 col-md-2">
<div class="card stat-card">
<div class="card-body py-2">
<div class="stat-value">{{.Stats.Total}}</div>
<div class="stat-label">Total Assets</div>
</div>
</div>
</div>
{{range .Stats.ByStatus}}
<div class="col-6 col-md-2">
<div class="card stat-card">
<div class="card-body py-2">
<div class="stat-value">{{.Count}}</div>
<div class="stat-label"><span class="badge text-bg-{{.Color}}">{{.Name}}</span></div>
</div>
</div>
</div>
{{end}}
</div>
<div class="row g-3 mb-3">
<div class="col-md-6">
<div class="card h-100">
<div class="card-header py-2 fw-semibold">Assets by Type</div>
<ul class="list-group list-group-flush">
{{range .Stats.ByType}}
<li class="list-group-item d-flex justify-content-between align-items-center py-1">
<span><i class="bi {{iconOr .Icon "bi-box-seam"}} me-2"></i>{{.Name}}</span>
<span class="badge text-bg-secondary rounded-pill">{{.Count}}</span>
</li>
{{else}}
<li class="list-group-item text-body-secondary py-2">No assets yet.</li>
{{end}}
</ul>
</div>
</div>
<div class="col-md-6">
<div class="card h-100">
<div class="card-header py-2 fw-semibold">Recently Added</div>
<ul class="list-group list-group-flush">
{{range .Stats.RecentlyAdded}}
<li class="list-group-item py-1">
<a href="#" class="asset-link text-decoration-none" data-id="{{.ID}}">
<i class="bi {{iconOr .ItemTypeIcon "bi-box-seam"}} me-2"></i>{{.Name}}
<span class="text-body-secondary small">{{.AssetTag}}</span>
</a>
</li>
{{else}}
<li class="list-group-item text-body-secondary py-2">No assets yet.</li>
{{end}}
</ul>
</div>
</div>
</div>
<h6 class="mb-2">Top-Level Folders</h6>
{{if .Folders}}
<div class="list-group mb-3">
{{range .Folders}}
<a href="#" class="list-group-item list-group-item-action folder-link d-flex align-items-center" data-id="{{.ID}}">
<i class="bi {{iconOr .Icon "bi-folder-fill"}} text-warning-emphasis me-2"></i>
{{.Name}}
<span class="text-body-secondary small ms-2">{{if .Description}}{{.Description}}{{end}}</span>
<span class="ms-auto text-body-secondary small">{{.FolderCount}} folder(s), {{.AssetCount}} asset(s)</span>
</a>
{{end}}
</div>
{{else}}
<p class="text-body-secondary">No folders yet. <span class="admin-only">Right-click here (or the tree) to create one.</span></p>
{{end}}
{{if .UnfiledAssets}}
<h6 class="mb-2">Unfiled Assets</h6>
<div class="table-responsive">
<table class="table table-sm table-hover asset-table">
<thead><tr><th>Asset ID</th><th>Name</th><th>Type</th><th>Status</th><th>Assigned</th></tr></thead>
<tbody>
{{range .UnfiledAssets}}
<tr class="asset-row" data-id="{{.ID}}">
<td>{{.AssetTag}}</td>
<td><i class="bi {{iconOr .ItemTypeIcon "bi-box-seam"}} me-1"></i>{{.Name}}</td>
<td>{{.ItemTypeName}}</td>
<td><span class="badge text-bg-{{.StatusColor}}">{{.StatusName}}</span></td>
<td>{{if .AssignedUsername}}{{.AssignedUsername}}{{else}}<span class="text-body-secondary">&mdash;</span>{{end}}</td>
</tr>
{{end}}
</tbody>
</table>
</div>
{{end}}
</div> </div>
{{end}} {{end}}
+3
View File
@@ -3,6 +3,9 @@
<a href="/settings" class="list-group-item list-group-item-action{{if eq . "general"}} active{{end}}"> <a href="/settings" class="list-group-item list-group-item-action{{if eq . "general"}} active{{end}}">
<i class="bi bi-sliders me-2"></i>General <i class="bi bi-sliders me-2"></i>General
</a> </a>
<a href="/settings/statuses" class="list-group-item list-group-item-action{{if eq . "statuses"}} active{{end}}">
<i class="bi bi-tag me-2"></i>Statuses
</a>
<a href="/settings/item-types" class="list-group-item list-group-item-action{{if eq . "itemtypes"}} active{{end}}"> <a href="/settings/item-types" class="list-group-item list-group-item-action{{if eq . "itemtypes"}} active{{end}}">
<i class="bi bi-tags me-2"></i>Item Types <i class="bi bi-tags me-2"></i>Item Types
</a> </a>