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
@@ -1,81 +1,69 @@
|
||||
{{define "asset_form"}}
|
||||
<div class="panel-content p-3">
|
||||
<nav aria-label="breadcrumb">
|
||||
<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}}
|
||||
data-title="{{if .Asset}}Edit {{.Asset.Name}}{{else}}New Asset{{end}}">
|
||||
<div class="row g-3">
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Asset ID</label>
|
||||
<input type="text" class="form-control" name="asset_id" value="{{if .Asset}}{{.Asset.AssetTag}}{{end}}" placeholder="Auto-generated if left blank">
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Name <span class="text-danger">*</span></label>
|
||||
<input type="text" class="form-control" name="name" value="{{if .Asset}}{{.Asset.Name}}{{end}}" required autofocus>
|
||||
</div>
|
||||
|
||||
<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="col-md-6">
|
||||
<label class="form-label">Asset ID</label>
|
||||
<input type="text" class="form-control" name="asset_id" value="{{if .Asset}}{{.Asset.AssetTag}}{{end}}" placeholder="Auto-generated if left blank">
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Name <span class="text-danger">*</span></label>
|
||||
<input type="text" class="form-control" name="name" value="{{if .Asset}}{{.Asset.Name}}{{end}}" required autofocus>
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Item Type <span class="text-danger">*</span></label>
|
||||
{{if .Asset}}
|
||||
<input type="text" class="form-control" value="{{.Asset.ItemTypeName}}" disabled>
|
||||
<div class="form-text">Item type cannot be changed after creation.</div>
|
||||
{{else}}
|
||||
<select class="form-select" name="item_type_id" id="assetFormItemType" required>
|
||||
{{range .ItemTypes}}<option value="{{.ID}}" {{if eq .ID $.SelectedIT}}selected{{end}}>{{.Name}}</option>{{end}}
|
||||
</select>
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Item Type <span class="text-danger">*</span></label>
|
||||
{{if .Asset}}
|
||||
<input type="text" class="form-control" value="{{.Asset.ItemTypeName}}" disabled>
|
||||
<div class="form-text">Item type cannot be changed after creation.</div>
|
||||
{{else}}
|
||||
<select class="form-select" name="item_type_id" id="assetFormItemType" required>
|
||||
{{range .ItemTypes}}<option value="{{.ID}}" {{if eq .ID $.SelectedIT}}selected{{end}}>{{.Name}}</option>{{end}}
|
||||
</select>
|
||||
{{end}}
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Folder</label>
|
||||
{{$selectedFolder := deref .FolderID}}
|
||||
{{if .Asset}}{{$selectedFolder = deref .Asset.FolderID}}{{end}}
|
||||
<select class="form-select" name="folder_id">
|
||||
<option value="">Inventory (top level)</option>
|
||||
{{range .FolderOptions}}
|
||||
<option value="{{.ID}}" {{if eq $selectedFolder .ID}}selected{{end}}>
|
||||
{{range seq .Depth}} {{end}}{{.Path}}
|
||||
</option>
|
||||
{{end}}
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Folder</label>
|
||||
{{$selectedFolder := deref .FolderID}}
|
||||
{{if .Asset}}{{$selectedFolder = deref .Asset.FolderID}}{{end}}
|
||||
<select class="form-select" name="folder_id">
|
||||
<option value="">Inventory (top level)</option>
|
||||
{{range .FolderOptions}}
|
||||
<option value="{{.ID}}" {{if eq $selectedFolder .ID}}selected{{end}}>
|
||||
{{range seq .Depth}} {{end}}{{.Path}}
|
||||
</option>
|
||||
{{end}}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Status <span class="text-danger">*</span></label>
|
||||
<select class="form-select" name="status_id" required>
|
||||
{{range .Statuses}}<option value="{{.ID}}" {{if $.Asset}}{{if eq .ID $.Asset.StatusID}}selected{{end}}{{end}}>{{.Name}}</option>{{end}}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Assigned User</label>
|
||||
{{$selectedUser := 0}}
|
||||
{{if .Asset}}{{$selectedUser = deref .Asset.AssignedUserID}}{{end}}
|
||||
<select class="form-select" name="assigned_user_id">
|
||||
<option value="">Unassigned</option>
|
||||
{{range .Users}}
|
||||
<option value="{{.ID}}" {{if eq $selectedUser .ID}}selected{{end}}>{{.Username}}</option>
|
||||
{{end}}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
<label class="form-label">Notes</label>
|
||||
<textarea class="form-control" name="notes" rows="3">{{if .Asset}}{{.Asset.Notes}}{{end}}</textarea>
|
||||
</div>
|
||||
|
||||
<div class="col-12" id="asset-fields-container">
|
||||
{{template "asset_fields_only" .Fields}}
|
||||
</div>
|
||||
</select>
|
||||
</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 class="col-md-6">
|
||||
<label class="form-label">Status <span class="text-danger">*</span></label>
|
||||
<select class="form-select" name="status_id" required>
|
||||
{{range .Statuses}}<option value="{{.ID}}" {{if $.Asset}}{{if eq .ID $.Asset.StatusID}}selected{{end}}{{end}}>{{.Name}}</option>{{end}}
|
||||
</select>
|
||||
</div>
|
||||
<div class="alert alert-danger mt-3 d-none" id="assetFormError"></div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Assigned User</label>
|
||||
{{$selectedUser := 0}}
|
||||
{{if .Asset}}{{$selectedUser = deref .Asset.AssignedUserID}}{{end}}
|
||||
<select class="form-select" name="assigned_user_id">
|
||||
<option value="">Unassigned</option>
|
||||
{{range .Users}}
|
||||
<option value="{{.ID}}" {{if eq $selectedUser .ID}}selected{{end}}>{{.Username}}</option>
|
||||
{{end}}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
<label class="form-label">Notes</label>
|
||||
<textarea class="form-control" name="notes" rows="3">{{if .Asset}}{{.Asset.Notes}}{{end}}</textarea>
|
||||
</div>
|
||||
|
||||
<div class="col-12" id="asset-fields-container">
|
||||
{{template "asset_fields_only" .Fields}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="alert alert-danger mt-3 d-none" id="assetFormError"></div>
|
||||
</form>
|
||||
{{end}}
|
||||
|
||||
@@ -77,6 +77,23 @@
|
||||
</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 -->
|
||||
<div class="modal fade" id="moveAssetModal" tabindex="-1">
|
||||
<div class="modal-dialog">
|
||||
|
||||
@@ -1,102 +1,5 @@
|
||||
{{define "panel_root"}}
|
||||
<div class="panel-content p-3" data-panel-type="root">
|
||||
<nav aria-label="breadcrumb">
|
||||
<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">—</span>{{end}}</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{{end}}
|
||||
<div class="panel-content panel-blank p-3 h-100 d-flex align-items-center justify-content-center" data-panel-type="root">
|
||||
<p class="text-body-secondary mb-0">Select a folder or asset from the tree.</p>
|
||||
</div>
|
||||
{{end}}
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
<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
|
||||
</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}}">
|
||||
<i class="bi bi-tags me-2"></i>Item Types
|
||||
</a>
|
||||
|
||||
Reference in New Issue
Block a user