Compare commits
23
Commits
34cee5f874
...
v3.41
No files matched your search
+1
-1
Submodule bible updated: 52444350c1...1977730d93.
@@ -62,13 +62,43 @@ Rules:
|
|||||||
## Pricing tab layout
|
## Pricing tab layout
|
||||||
|
|
||||||
The Pricing tab (Ценообразование) has two tables: Buy (Цена покупки) and Sale (Цена продажи).
|
The Pricing tab (Ценообразование) has two tables: Buy (Цена покупки) and Sale (Цена продажи).
|
||||||
|
Their column sets differ (see below); the shared per-LOT row expansion/grouping rules apply to both.
|
||||||
|
|
||||||
Column order (both tables):
|
Buy table column order:
|
||||||
|
|
||||||
```
|
```
|
||||||
PN вендора | Описание | LOT | Кол-во | Estimate | Склад | Конкуренты | Ручная цена
|
PN вендора | Описание | LOT | Кол-во | Estimate | Склад | Конкуренты | Ручная цена
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Sale table column order:
|
||||||
|
|
||||||
|
```
|
||||||
|
PN вендора | Описание | LOT | Кол-во | Накидка, % | Цена
|
||||||
|
```
|
||||||
|
|
||||||
|
Sale per-row pricing (`_saleRowPrice`/`recomputeSalePrices` in `index.html`,
|
||||||
|
`applySaleRowPricing` in `internal/services/export.go`):
|
||||||
|
- each row's base is its raw Estimate unit price × qty, unless the table-wide "Ручная
|
||||||
|
цена" input is set — then the base is that row's proportional share of the manual
|
||||||
|
total (same distribution as before this existed, last row absorbs the rounding
|
||||||
|
remainder), overwriting the row's own base rather than filling a separate column;
|
||||||
|
- `Цена = base × (Аплифт к estimate + row's own Накидка% / 100)` — Накидка is a
|
||||||
|
per-row percentage, additive to the table-wide uplift, entered directly in the
|
||||||
|
row's own input; unset rows default to 0% (no change to older configs' totals);
|
||||||
|
Склад/Конкуренты are not shown or exported for the Sale table;
|
||||||
|
- per-row Накидка is keyed by `"<vendorPN>::<lot>"` (uppercased, "NONE" when there's
|
||||||
|
no vendor PN) — plain `lot_name` isn't a safe key since the same LOT can appear
|
||||||
|
under more than one vendor-PN group (see row expansion rules below) — and persisted
|
||||||
|
as an additive key, `Notes.pricing_ui.sale_row_markups`, alongside the existing
|
||||||
|
`sale_uplift`/`sale_custom_price` (see
|
||||||
|
[decisions/2026-09-15-sale-row-markup-and-minimal-csv.md](decisions/2026-09-15-sale-row-markup-and-minimal-csv.md));
|
||||||
|
- the Sale table's own "Экспорт CSV" button additionally sends
|
||||||
|
`minimal_sale_columns: true` + `sale_row_markups`, which collapses
|
||||||
|
`POST /api/configs/:uuid/export/pricing` output to exactly `LOT;Описание;Кол-во;Цена`
|
||||||
|
(`ProjectPricingExportOptions.MinimalSaleColumns` in `internal/services/export.go`).
|
||||||
|
This is scoped to that one request: Buy export and the project-level bulk export
|
||||||
|
never set it and are unaffected.
|
||||||
|
|
||||||
Per-LOT row expansion rules:
|
Per-LOT row expansion rules:
|
||||||
- each `lot_mappings` entry in a BOM row becomes its own table row with its own quantity and prices;
|
- each `lot_mappings` entry in a BOM row becomes its own table row with its own quantity and prices;
|
||||||
- `baseLot` (resolved LOT without an explicit mapping) is treated as the first sub-row with `quantity_per_pn` from `_getRowLotQtyPerPN`;
|
- `baseLot` (resolved LOT without an explicit mapping) is treated as the first sub-row with `quantity_per_pn` from `_getRowLotQtyPerPN`;
|
||||||
@@ -85,6 +115,12 @@ Controls terminology:
|
|||||||
|
|
||||||
CSV export reads PN вендора, Описание, and LOT from `data-vendor-pn`, `data-desc`, `data-lot` row attributes to bypass the rowspan cell offset problem.
|
CSV export reads PN вендора, Описание, and LOT from `data-vendor-pn`, `data-desc`, `data-lot` row attributes to bypass the rowspan cell offset problem.
|
||||||
|
|
||||||
|
In the colour-optional indicator mode (`app_settings.indicator_mode = "accessible"`, see
|
||||||
|
[03-database.md](03-database.md) and [decisions/2026-08-31-accessible-indicator-mode.md](decisions/2026-08-31-accessible-indicator-mode.md))
|
||||||
|
both tables gain a narrow leading price-quality meter column (per sub-row), the row background
|
||||||
|
tint is removed, `world`-fallback cells show a `W` text marker instead of amber, and the footer
|
||||||
|
total shows a `⚠` prefix instead of red. CSV output is unaffected.
|
||||||
|
|
||||||
## Configuration versioning
|
## Configuration versioning
|
||||||
|
|
||||||
Configuration revisions are append-only snapshots stored in `local_configuration_versions`.
|
Configuration revisions are append-only snapshots stored in `local_configuration_versions`.
|
||||||
@@ -151,6 +187,34 @@ Rules:
|
|||||||
- `config_types[].categories` is an allowlist: a category absent from all types is shown everywhere;
|
- `config_types[].categories` is an allowlist: a category absent from all types is shown everywhere;
|
||||||
- `qt_categories.name` and `qt_categories.name_ru` are not used by QF runtime; do not depend on them.
|
- `qt_categories.name` and `qt_categories.name_ru` are not used by QF runtime; do not depend on them.
|
||||||
|
|
||||||
|
## Article generation
|
||||||
|
|
||||||
|
`internal/article` builds the `article` string (`{MODEL}-{CPU}-{MEM}-{GPU}-{DISK}-{NET}-{PSU}-{SUPPORT}`)
|
||||||
|
from the configuration's `items` + `server_model`.
|
||||||
|
|
||||||
|
- which segment a cart LOT belongs to is decided by its `lot_category`, resolved through
|
||||||
|
`ResolveLotCategories` → `GetLocalComponentCategoriesByLotNames`, i.e. the **component
|
||||||
|
universe** (latest active `world` ∪ `estimate`), the same source the configurator/BOM/pricing
|
||||||
|
tab use. It must **not** be scoped to the configuration's pinned pricelist: a world-only LOT
|
||||||
|
(e.g. `GPU_NV_RTX_PRO_6000D_...`, priced by the world fallback, never added to the estimate
|
||||||
|
pricelist) is a legitimate cart member and still carries a real `lot_category` in `world`.
|
||||||
|
Scoping to one pricelist silently dropped such LOTs from the article. See
|
||||||
|
[decisions/2026-09-01-article-category-from-component-universe.md](decisions/2026-09-01-article-category-from-component-universe.md);
|
||||||
|
- `BuildOptions` no longer takes a pricelist; `POST /api/configs/preview-article` still accepts
|
||||||
|
`pricelist_id` but ignores it;
|
||||||
|
- category comes only from real synced pricelist columns — never inferred from the `lot_name`
|
||||||
|
prefix (the `SVC_` SUPPORT segment is the sole lot_name-pattern exception, see below);
|
||||||
|
- within a segment the model/capacity/speed **token** is still parsed from the `lot_name` —
|
||||||
|
that is the article text itself, not categorization;
|
||||||
|
- when a token can't be parsed (the `lot_name` doesn't fit `{GROUP}_{VENDOR}_{MODEL}[_{SPEC}…]`)
|
||||||
|
the segment carries the LOT's `lot_category` as the token — **never** a bare `UNK`. Such a
|
||||||
|
segment comes back with `Recognized = false` in `BuildResult.Segments`, plus a `Warnings`
|
||||||
|
entry naming the `lot_name`. The configurator highlights the segment (amber) and lists the
|
||||||
|
warnings; create/update/rollback log `WARN "article generation degraded"`. No catalog of real
|
||||||
|
lot_names / model names lives in the repo (`no-hardcoded-vendors`), so only *structural*
|
||||||
|
parse failure is detected, not a wrong-but-well-formed token. See
|
||||||
|
[decisions/2026-09-01-article-degraded-token-visibility.md](decisions/2026-09-01-article-degraded-token-visibility.md).
|
||||||
|
|
||||||
## Support as a BOM LOT
|
## Support as a BOM LOT
|
||||||
|
|
||||||
The Base tab's support-level picker adds/replaces a synthetic LOT in `cart` (e.g.
|
The Base tab's support-level picker adds/replaces a synthetic LOT in `cart` (e.g.
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ Main tables:
|
|||||||
| `local_partnumber_book_items` | PN -> LOT catalog payload |
|
| `local_partnumber_book_items` | PN -> LOT catalog payload |
|
||||||
| `pending_changes` | sync queue |
|
| `pending_changes` | sync queue |
|
||||||
| `connection_settings` | encrypted MariaDB connection settings |
|
| `connection_settings` | encrypted MariaDB connection settings |
|
||||||
| `app_settings` | local app state |
|
| `app_settings` | local app state (key→value); includes `indicator_mode` = `color` \| `accessible`, a per-client display preference set on `/setup` |
|
||||||
| `local_schema_migrations` | applied local migration markers |
|
| `local_schema_migrations` | applied local migration markers |
|
||||||
| `local_qt_settings` | server-pushed configurator settings cache (from `qt_settings`) |
|
| `local_qt_settings` | server-pushed configurator settings cache (from `qt_settings`) |
|
||||||
|
|
||||||
@@ -261,7 +261,9 @@ PK: lot_name
|
|||||||
| price | decimal(12,2) NOT NULL | |
|
| price | decimal(12,2) NOT NULL | |
|
||||||
| price_quality | tinyint unsigned, nullable | added by migration 033. Set by the external pricelist-building tool, 0-9, based on quote recency/count per its own per-lot pricing-period settings — QF only reads and displays it, never computes it. |
|
| price_quality | tinyint unsigned, nullable | added by migration 033. Set by the external pricelist-building tool, 0-9, based on quote recency/count per its own per-lot pricing-period settings — QF only reads and displays it, never computes it. |
|
||||||
|
|
||||||
`price_quality` is synced through `LocalPricelistItem` (pricelist detail page) and, separately, through `LocalComponent`/`services.ComponentView` (`/api/components`, used by the configurator's search dropdown and item table) — both read paths go through `pricelistItemRow`/`toLocalComponent()` in `internal/localdb/components.go`. The `/api/components` path reads the component universe (`world` ∪ `estimate`, see [decisions/2026-07-24-component-universe-world-union.md](decisions/2026-07-24-component-universe-world-union.md)), where a world-only LOT is forced to `price_quality = 0` — the only place QF writes this field rather than reading it. The color scale (red 0 → yellow 5 → green 9, gradient) lives in **one shared JS module**, `web/static/price-quality.js` (loaded by `base.html` for every page) — `priceQualityColor`/`qualityDotHtml`/`qualityBadgeHtml`/`qualityRowStyle`. Do not reimplement the color scale locally in a template; add a new helper to that module instead. Used in: pricelist detail "Качество" column, configurator search dropdown (colored dot), configurator table (leftmost quality-dot column), pricing tab (row background tint).
|
`price_quality` is synced through `LocalPricelistItem` (pricelist detail page) and, separately, through `LocalComponent`/`services.ComponentView` (`/api/components`, used by the configurator's search dropdown and item table) — both read paths go through `pricelistItemRow`/`toLocalComponent()` in `internal/localdb/components.go`. The `/api/components` path reads the component universe (`world` ∪ `estimate`, see [decisions/2026-07-24-component-universe-world-union.md](decisions/2026-07-24-component-universe-world-union.md)), where a world-only LOT is forced to `price_quality = 0` — the only place QF writes this field rather than reading it. The visual scale lives in **one shared JS module**, `web/static/price-quality.js` (loaded by `base.html` for every page) — `priceQualityColor`/`priceQualityLevel`/`qualityMeterHtml`/`qualityDotHtml`/`qualityBadgeHtml`/`qualityRowStyle`. Do not reimplement the scale locally in a template; add a new helper to that module instead. Used in: pricelist detail "Качество" column, configurator search dropdown, configurator table (leftmost quality column), pricing tab.
|
||||||
|
|
||||||
|
The module has **two render modes**, chosen per client by `window.QF_INDICATOR_MODE` (injected by `base.html` from `app_settings.indicator_mode`, default `color`): `color` = hue scale red 0 → yellow 5 → green 9; `accessible` = colour-blind-safe 5-step signal-strength meter (`priceQualityLevel`: `0-1/2-3/4-5/6-7/8-9`), single neutral hue. In `accessible` mode the pricing tab drops the row background tint for a leading meter column, the `world`-fallback amber cell tint becomes a `W` text marker, and the "contaminated total" red becomes a `⚠` prefix — see [decisions/2026-08-31-accessible-indicator-mode.md](decisions/2026-08-31-accessible-indicator-mode.md). Any new colour-only signal must add a branch in this module keyed on `isAccessible()`, not a local one.
|
||||||
|
|
||||||
The real table also has `price_method`, `price_period_days`, `price_coefficient`, `manual_price`, `meta_prices` and `lead_time_weeks` columns, owned and written by the external pricing engine that maintains `qt_pricelist_items` — **keep them in the table for backward compatibility with that system; QF must never drop, rename, or write to them.** QF itself does not model, sync, or display any of them (tried once, removed as unused/dead in the client). Do not re-add them to `models.PricelistItem`/`LocalPricelistItem` without a concrete UI need.
|
The real table also has `price_method`, `price_period_days`, `price_coefficient`, `manual_price`, `meta_prices` and `lead_time_weeks` columns, owned and written by the external pricing engine that maintains `qt_pricelist_items` — **keep them in the table for backward compatibility with that system; QF must never drop, rename, or write to them.** QF itself does not model, sync, or display any of them (tried once, removed as unused/dead in the client). Do not re-add them to `models.PricelistItem`/`LocalPricelistItem` without a concrete UI need.
|
||||||
|
|
||||||
|
|||||||
@@ -29,6 +29,17 @@
|
|||||||
|
|
||||||
`POST /api/restart` exists only in `debug` mode.
|
`POST /api/restart` exists only in `debug` mode.
|
||||||
|
|
||||||
|
## Settings
|
||||||
|
|
||||||
|
| Method | Path | Purpose |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `GET` | `/api/settings/ui` | read per-client UI display preferences → `{ "indicator_mode": "color" \| "accessible" }` |
|
||||||
|
| `PUT` | `/api/settings/ui` | set `indicator_mode` (body `{ "indicator_mode": ... }`); `422` on an unknown value |
|
||||||
|
|
||||||
|
Stored in `app_settings` (SQLite); no restart. Registered in both the normal and the setup-mode
|
||||||
|
route sets. Consumed by `web/static/price-quality.js` and the pricing tab via a
|
||||||
|
`window.QF_INDICATOR_MODE` global that `base.html` renders from the same setting.
|
||||||
|
|
||||||
## Reference data
|
## Reference data
|
||||||
|
|
||||||
| Method | Path | Purpose |
|
| Method | Path | Purpose |
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
# Decision: project-level DDP export uses each configuration's own sale uplift
|
||||||
|
|
||||||
|
**Date:** 2026-08-12
|
||||||
|
**Status:** active
|
||||||
|
|
||||||
|
## Context
|
||||||
|
|
||||||
|
Two code paths produce the same "Ценообразование" (pricing) CSV: exporting a single
|
||||||
|
configuration from `index.html` (`exportPricingCSV`), and exporting an entire project
|
||||||
|
from `project_detail.html` (`exportProject` → `POST /api/projects/:uuid/export` →
|
||||||
|
`ExportProjectPricingCSV`). Both end up in `ExportService.buildPricingExportBlock`.
|
||||||
|
|
||||||
|
Each configuration's "Аплифт к estimate" (`#pricing-uplift-sale` in the pricing tab) is
|
||||||
|
saved per configuration, piggybacked into `Configuration.Notes` as
|
||||||
|
`{"pricing_ui":{"sale_uplift":...}}` (see `serializeConfigNotes`/
|
||||||
|
`restorePricingStateFromNotes` in `index.html`). The single-config export sends this value
|
||||||
|
explicitly as `sale_markup` in the request, so it always applies the right uplift.
|
||||||
|
|
||||||
|
The project-level export modal never had an uplift input and never sent `sale_markup`, so
|
||||||
|
`ProjectPricingExportOptions.SaleMarkup` was always `0`. `buildPricingExportBlock` used to
|
||||||
|
fall back to a single hardcoded `defaultSaleMarkup` (1.3) for every configuration in the
|
||||||
|
project, silently ignoring each configuration's own saved uplift — a bulk DDP export did
|
||||||
|
not match what exporting those same configurations individually would produce.
|
||||||
|
|
||||||
|
## Decision
|
||||||
|
|
||||||
|
`buildPricingExportBlock` resolves the DDP estimate factor per configuration via
|
||||||
|
`ProjectPricingExportOptions.effectiveSaleMarkupFactor(cfg)`:
|
||||||
|
|
||||||
|
- an explicit `opts.SaleMarkup` (only ever sent by the single-config pricing tab, which
|
||||||
|
knows the live-edited value that may not be saved yet) always wins;
|
||||||
|
- otherwise it reads that configuration's own saved uplift from `Notes`
|
||||||
|
(`configSavedSaleUplift`);
|
||||||
|
- otherwise it falls back to `defaultSaleMarkup` (1.3), same as before, for configurations
|
||||||
|
that never had an uplift saved.
|
||||||
|
|
||||||
|
Both `applyDDPMarkup` call sites in `buildPricingExportBlock` (the BOM-driven branch and
|
||||||
|
the plain-items fallback) use this per-configuration factor. Stock/Competitor keep using
|
||||||
|
the fixed `stockCompetitorMarkupFactor` (1.3) — only the Estimate uplift is configurable.
|
||||||
|
|
||||||
|
## Consequences
|
||||||
|
|
||||||
|
- Project-level DDP export now goes through the same "pipeline" as single-config export:
|
||||||
|
each row's Estimate is scaled by that configuration's own saved uplift, not a
|
||||||
|
project-wide constant.
|
||||||
|
- If a future caller needs to force one uplift across an entire project export regardless
|
||||||
|
of individual configs' saved settings, it must do so explicitly via `sale_markup` in the
|
||||||
|
request — do not reintroduce a silent global default that overrides saved per-config
|
||||||
|
values.
|
||||||
|
- `configSavedSaleUplift` only reads `Notes`; it does not fail loudly on malformed/foreign
|
||||||
|
JSON in that field — it just returns 0 and lets the 1.3 fallback apply.
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
# Decision: `indicator_mode` — a colour-optional rendering mode for UI signals
|
||||||
|
|
||||||
|
**Date:** 2026-08-31
|
||||||
|
**Status:** active
|
||||||
|
|
||||||
|
## Context
|
||||||
|
|
||||||
|
Several UI signals were encoded by hue alone and unreadable with a colour-vision deficiency:
|
||||||
|
|
||||||
|
- `price_quality` (0–9) as a red→yellow→green gradient — a dot in the configurator search
|
||||||
|
dropdown and inline before `lot_name`, a coloured number in the pricelist "Качество" column,
|
||||||
|
a full-row background tint on the "Ценообразование" tab;
|
||||||
|
- the amber `world`-fallback price cell tint
|
||||||
|
([2026-07-10-world-pricelist-fallback.md](2026-07-10-world-pricelist-fallback.md));
|
||||||
|
- the red "contaminated total" in the pricing footer
|
||||||
|
([2026-07-24-pricing-total-world-share.md](2026-07-24-pricing-total-world-share.md)).
|
||||||
|
|
||||||
|
The bible has no dedicated accessibility contract, but `table-management` §Icon Semantics,
|
||||||
|
`controls-selection` §Buttons, `go-code-style` §Business Logic Placement and `build-version-display`
|
||||||
|
say the same thing: meaning is never carried by one ambiguous channel — back it with
|
||||||
|
shape / number / explicit `title`+`aria-label`, and keep the indicator visually subordinate.
|
||||||
|
|
||||||
|
## Decision
|
||||||
|
|
||||||
|
One per-client preference, **`app_settings.indicator_mode`** = `color` (default) | `accessible`,
|
||||||
|
set on `/setup` ("Настройки") via `GET`/`PUT /api/settings/ui` (`internal/handlers/settings.go`)
|
||||||
|
— no restart. Deliberately named for the concern (how indicators are rendered), not for the
|
||||||
|
current widget, so future colour-only signals attach to the same switch.
|
||||||
|
|
||||||
|
`internal/handlers/web.go` `render()` and `internal/handlers/setup.go` inject the mode for every
|
||||||
|
page; `base.html` publishes it as `window.QF_INDICATOR_MODE`. `web/static/price-quality.js` is
|
||||||
|
still the single source of the price-quality scale and branches on the mode internally, so its
|
||||||
|
call sites do not change.
|
||||||
|
|
||||||
|
In `accessible` mode:
|
||||||
|
|
||||||
|
- `price_quality` renders as a **5-step signal-strength meter** (`priceQualityLevel` =
|
||||||
|
`min(4, floor(score/2))` → `0-1 / 2-3 / 4-5 / 6-7 / 8-9`), five bars in one neutral hue, each
|
||||||
|
instance carrying `title`/`aria-label` = `Качество цены: N/9`. `qualityDotHtml` and
|
||||||
|
`qualityBadgeHtml` return the meter;
|
||||||
|
- `qualityRowStyle` returns `''` — the pricing tab instead shows the meter in a narrow leading
|
||||||
|
column (conditional `<th>` / `colspan` in `index.html`, per-sub-row `<td>`);
|
||||||
|
- the `world`-fallback amber class is dropped for a `W` superscript text marker on the price
|
||||||
|
(text, not a colour class — `applyCustomPrice`'s colour-stripping regex is a non-issue);
|
||||||
|
- `_setPricingTotal` drops `text-red-600` for a leading `⚠` glyph, on the same trigger as the
|
||||||
|
red (`worldShare > 0`). The hover popup — including the "prices for N of M positions" coverage
|
||||||
|
line — is unchanged in both modes; per 2026-07-24 there is still no colour-coded coverage-only
|
||||||
|
signal, and `accessible` mode does not add one.
|
||||||
|
|
||||||
|
`color` mode is byte-for-byte the previous behaviour.
|
||||||
|
|
||||||
|
## Consequences
|
||||||
|
|
||||||
|
- Default unchanged; nothing moves until a user opts in on `/setup`.
|
||||||
|
- `web/static/price-quality.js` stays the only place that knows the 0–9 scale. Any new
|
||||||
|
colour-coded quality/price signal adds a branch there keyed on `isAccessible()`, never a local
|
||||||
|
reimplementation, and its `accessible` form must be shape/text, not another hue.
|
||||||
|
- The pricing-tab tables have a mode-dependent column count (8 / 9). `index.html` guards the
|
||||||
|
`<th>`, the empty-state `colspan`, the `tfoot` "Итого:" `colspan` and the JS row template on
|
||||||
|
`ACCESSIBLE_MODE` / `{{ eq .IndicatorMode "accessible" }}`. CSV export is untouched — it reads
|
||||||
|
`data-*` row attributes, not cell positions.
|
||||||
|
- New routes `GET`/`PUT /api/settings/ui`, registered in both the normal and setup-mode route
|
||||||
|
sets in `cmd/qfs/main.go`. `render()` nil-guards `localDB` for tests.
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
# Decision: article generation reads lot_category from the component universe, not one pricelist
|
||||||
|
|
||||||
|
**Date:** 2026-09-01
|
||||||
|
**Status:** active
|
||||||
|
|
||||||
|
## Context
|
||||||
|
|
||||||
|
`internal/article/generator.go` classifies each cart LOT into an article segment
|
||||||
|
(CPU / MEM / GPU / DISK / NET / PSU) by its `lot_category`. That category was
|
||||||
|
resolved by `ResolveLotCategories` → `GetLocalLotCategoriesByServerPricelistID`,
|
||||||
|
which queries exactly **one** pricelist — the configuration's pinned
|
||||||
|
`pricelist_id` (an `estimate` pricelist). A segment builder skips any LOT whose
|
||||||
|
category is unknown, so a LOT absent from that one pricelist vanished from the
|
||||||
|
article with no warning.
|
||||||
|
|
||||||
|
`GPU_NV_RTX_PRO_6000D_SERVER_84GB_PCIE` exposed this: it exists only in `world`
|
||||||
|
pricelists (where it correctly carries `lot_category = GPU`) and in no `estimate`
|
||||||
|
pricelist. It was priced (world fallback), exported, and shown in the cart, but
|
||||||
|
dropped from the article.
|
||||||
|
|
||||||
|
This is the same class of bug as
|
||||||
|
[2026-07-24-component-universe-world-union.md](2026-07-24-component-universe-world-union.md):
|
||||||
|
the cart's LOT set is `world` ∪ `estimate`, and no read path may silently drop a
|
||||||
|
LOT that only lives in `world`. Article generation was the one component-reading
|
||||||
|
path still scoped to a single pricelist.
|
||||||
|
|
||||||
|
Deriving the category from the `lot_name` prefix was rejected — it is forbidden by
|
||||||
|
the pricelist-contract rules (`02-architecture.md`, `bible/rules/patterns/`):
|
||||||
|
category comes only from real synced pricelist columns.
|
||||||
|
|
||||||
|
## Decision
|
||||||
|
|
||||||
|
`ResolveLotCategories(local, lotNames)` now calls
|
||||||
|
`LocalDB.GetLocalComponentCategoriesByLotNames`, which reads the component universe
|
||||||
|
(`componentUniverse()` — latest active `world` ∪ `estimate`, estimate wins a
|
||||||
|
collision). The server-pricelist parameter is gone.
|
||||||
|
|
||||||
|
- `article.BuildOptions` no longer has `ServerPricelist`.
|
||||||
|
- `POST /api/configs/preview-article` and the create/update paths still accept
|
||||||
|
`pricelist_id` but ignore it for article purposes.
|
||||||
|
- The `lot_name`-token parsing inside a segment (CPU model, memory size, GPU model,
|
||||||
|
disk capacity, port speed, wattage) still parses the token from the `lot_name` —
|
||||||
|
that produces the article text, it does not categorize. One parser bug was fixed
|
||||||
|
alongside: `parseGPUModel` required the model-number token to be all digits
|
||||||
|
(`isNumeric`), so `RTX_PRO_6000D` lost its `D` and collapsed to `RTX_84GB` —
|
||||||
|
indistinguishable from a real `RTX` card and different from its sibling
|
||||||
|
`RTX_PRO_6000` → `RTX6000_96GB`. It now accepts a digit-first alphanumeric token
|
||||||
|
(`isModelNumber`), giving `RTX6000D_84GB`.
|
||||||
|
|
||||||
|
## Consequences
|
||||||
|
|
||||||
|
- A world-only LOT lands in the article with its real category. Article generation
|
||||||
|
no longer depends on which pricelist a LOT was added to.
|
||||||
|
- The article can shift if the latest active `world`/`estimate` pricelist
|
||||||
|
recategorizes a LOT — acceptable, and consistent with how the configurator's
|
||||||
|
category tabs already behave.
|
||||||
|
- `GetLocalLotCategoriesByServerPricelistID` still exists and is still used by
|
||||||
|
`services/rental.go` and `services/export.go`. Those paths have the same
|
||||||
|
single-pricelist blind spot for world-only LOTs; migrating them is out of scope
|
||||||
|
here but should follow the same direction.
|
||||||
|
- Covered by `TestResolveLotCategories_WorldOnlyLot` in
|
||||||
|
`internal/article/categories_test.go`.
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
# Decision: unparsed article tokens degrade to a visible category placeholder, never "UNK"
|
||||||
|
|
||||||
|
**Date:** 2026-09-01
|
||||||
|
**Status:** active
|
||||||
|
|
||||||
|
## Context
|
||||||
|
|
||||||
|
`internal/article` builds each segment by parsing a spec token out of the `lot_name`
|
||||||
|
(CPU model, memory size, GPU model, disk capacity, port speed, wattage). When a
|
||||||
|
`lot_name` did not match the expected shape the generator failed silently or
|
||||||
|
misleadingly:
|
||||||
|
|
||||||
|
- `parseCPUModel` / `parseGPUModel` fell back to `normalizeModelToken` or a literal
|
||||||
|
`"UNK"` with **no signal** — and a partial parse (`RTX_PRO_6000D` → `RTX_84GB`)
|
||||||
|
produced a plausible but wrong token indistinguishable from a real result;
|
||||||
|
- `NET` / `PSU` emitted `UNKNET` / `UNKPSU`;
|
||||||
|
- `MEM` / `DISK` dropped the segment or the capacity and emitted only a terse
|
||||||
|
`mem_unknown` / `disk_unknown` warning;
|
||||||
|
- `BuildResult.Warnings` existed but **nothing consumed it**: the `preview-article`
|
||||||
|
frontend ignored the field and the create/update paths discarded it.
|
||||||
|
|
||||||
|
So a new naming shape (a vendor renames a card family, moves memory ahead of the
|
||||||
|
model, glues an architecture onto the token) would silently produce a wrong or
|
||||||
|
truncated article and no one would notice.
|
||||||
|
|
||||||
|
A vendor/model catalog in the repo to validate tokens against was rejected — it
|
||||||
|
violates `bible/rules/patterns/no-hardcoded-vendors` and needs constant upkeep.
|
||||||
|
Detection is therefore limited to **structural** failure (the name doesn't fit
|
||||||
|
`{GROUP}_{VENDOR}_{MODEL}[_{SPEC}…]`); semantic drift where a wrong token still
|
||||||
|
parses cleanly cannot be caught automatically and is out of scope.
|
||||||
|
|
||||||
|
## Decision
|
||||||
|
|
||||||
|
1. `"UNK"` / `"UNKNET"` / `"UNKPSU"` are gone. When a spec token can't be parsed the
|
||||||
|
article carries the LOT's `lot_category` as the token (`4xGPU`, `2xCPU`,
|
||||||
|
`768G+MEM`, …) via `placeholderToken`.
|
||||||
|
2. Each `build*Segment` returns a `segmentResult{value, degraded, warnings}`. Every
|
||||||
|
degraded segment produces a warning that **names the offending `lot_name`** and
|
||||||
|
states which category was written instead.
|
||||||
|
3. `BuildResult` gains `Segments []ResultSegment{Group, Text, Recognized}`.
|
||||||
|
`Recognized == false` marks a segment whose token is a placeholder.
|
||||||
|
4. `parseCPUModel` / `parseGPUModel` return `(token, ok)`; `ok == false` on the
|
||||||
|
last-ditch fallback path.
|
||||||
|
5. Consumers surface it:
|
||||||
|
- `POST /api/configs/preview-article` returns `segments` and `warnings`; the
|
||||||
|
configurator's article line renders each not-`recognized` segment highlighted
|
||||||
|
(amber) and lists the warnings beneath it (`renderArticleDisplay` in
|
||||||
|
`web/templates/index.html`);
|
||||||
|
- create / update / rollback log `WARN "article generation degraded"` with the
|
||||||
|
`server_model`, article and warnings.
|
||||||
|
6. No list of real `lot_name`s or model names is committed to the repo — not as a
|
||||||
|
fixture, not as a golden table. Tests use synthetic names only.
|
||||||
|
|
||||||
|
## Consequences
|
||||||
|
|
||||||
|
- An unrecognised LOT is always visible in the UI (highlighted token + warning) and
|
||||||
|
in server logs — never a silent drop or a bare `UNK`.
|
||||||
|
- The stored `article` string still contains only the placeholder token; the
|
||||||
|
`recognized` flags are not persisted (regenerated on next save / preview).
|
||||||
|
- `compressArticle` now returns `[]namedSeg` (the caller re-joins) so the degraded
|
||||||
|
flags survive compression.
|
||||||
|
- Structural detection only: a wrong-but-well-formed token (e.g. a future `GTX`
|
||||||
|
where `RTX` was expected) still passes. Closing that needs a validation source,
|
||||||
|
deferred pending a server-side structured-attribute contract.
|
||||||
|
- Covered by `TestBuild_UnparseableModel_CategoryPlaceholder` and
|
||||||
|
`TestParseGPUModel_VendorLetterSuffix`.
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
# Decision: per-row "Накидка" on the Sale table + minimal Sale CSV columns
|
||||||
|
|
||||||
|
**Date:** 2026-09-15
|
||||||
|
**Status:** active
|
||||||
|
|
||||||
|
## Context
|
||||||
|
|
||||||
|
The Sale (Цена продажи) table only had one table-wide "Аплифт к estimate" multiplier
|
||||||
|
and one table-wide "Ручная цена" override. There was no way to push margin up on
|
||||||
|
individual rows (e.g. scarce GPUs) without changing the uplift for every row, and the
|
||||||
|
table showed Estimate/Склад/Конкуренты/Ручная-цена columns that a sales rep handing a
|
||||||
|
quote to a customer never needed — the actual deliverable is just LOT, Описание, Кол-во,
|
||||||
|
and a final price.
|
||||||
|
|
||||||
|
## Decision
|
||||||
|
|
||||||
|
- The Sale table gains a per-row "Накидка, %" input. Each row's final "Цена" is
|
||||||
|
`base × (Аплифт к estimate + Накидка% / 100)`, where `base` is the row's raw Estimate
|
||||||
|
unit price × qty, or — when the table-wide "Ручная цена" is set — that row's
|
||||||
|
proportional share of the manual total (same last-row-absorbs-remainder distribution
|
||||||
|
the table-wide manual price already used, now overwriting the row's base instead of
|
||||||
|
filling a separate column).
|
||||||
|
- The Sale table's visible/exported columns collapse to
|
||||||
|
`PN вендора | Описание | LOT | Кол-во | Накидка, % | Цена` on screen, and exactly
|
||||||
|
`LOT;Описание;Кол-во;Цена` in its own CSV export. Estimate, Склад, Конкуренты, and
|
||||||
|
the old Ручная-цена column are no longer shown or exported for this table. The Buy
|
||||||
|
table (Цена покупки) is untouched.
|
||||||
|
- Per-row markup is keyed by `"<vendorPN>::<lot>"` (uppercased, `NONE` when there is no
|
||||||
|
vendor PN) — not by `lot_name` alone, since the same LOT can appear under more than
|
||||||
|
one vendor-PN BOM group (see "Per-LOT row expansion rules" in `02-architecture.md`).
|
||||||
|
- Persistence is additive: `Configuration.Notes.pricing_ui` gains a new
|
||||||
|
`sale_row_markups` map alongside the existing `sale_uplift`/`sale_custom_price`, the
|
||||||
|
same JSON-blob-in-`Notes` mechanism established by
|
||||||
|
[2026-08-12-project-export-per-config-sale-uplift.md](2026-08-12-project-export-per-config-sale-uplift.md).
|
||||||
|
Zero/unset rows are omitted from the map entirely.
|
||||||
|
- CSV export: `POST /api/configs/:uuid/export/pricing` gained `minimal_sale_columns`
|
||||||
|
(bool) and `sale_row_markups` (map) request fields, read into
|
||||||
|
`ProjectPricingExportOptions.MinimalSaleColumns`/`SaleRowMarkups`. These are wired
|
||||||
|
**only** in `ExportConfigPricingCSV`, gated on `req.MinimalSaleColumns` being true —
|
||||||
|
the Sale table's own "Экспорт CSV" button is the only caller that sets it. Buy export
|
||||||
|
(basis=fob) and the project-level bulk export (`ExportProjectPricingCSV`) never send
|
||||||
|
it and keep their full existing column sets/output unchanged.
|
||||||
|
- `ProjectPricingExportOptions.ManualPrice`, previously parsed from the request but
|
||||||
|
never actually read into the options struct (a pre-existing dead field), is now wired
|
||||||
|
— but only inside the same `MinimalSaleColumns` gate, so this bug fix does not change
|
||||||
|
Buy-table CSV output for anyone already relying on the old (broken) behavior.
|
||||||
|
|
||||||
|
## Consequences
|
||||||
|
|
||||||
|
- Old clients / already-saved configurations are unaffected: `sale_row_markups` absent
|
||||||
|
from `Notes` means every row's markup defaults to 0%, reproducing the exact totals
|
||||||
|
the table produced before this change (uplift-only). Old clients that don't know the
|
||||||
|
new `Notes` key simply ignore it, exactly like `sale_uplift` is ignored by even older
|
||||||
|
code.
|
||||||
|
- If a future caller needs the full-column DDP CSV format with per-row markup applied,
|
||||||
|
it must do so explicitly — `MinimalSaleColumns` intentionally couples "reduced
|
||||||
|
columns" and "per-row markup applied" as one request-level switch rather than two
|
||||||
|
independent options, since the only current caller needs both together.
|
||||||
+88
-117
@@ -581,6 +581,10 @@ func runSetupMode(local *localdb.LocalDB) {
|
|||||||
router.POST("/setup/test", setupHandler.TestConnection)
|
router.POST("/setup/test", setupHandler.TestConnection)
|
||||||
router.GET("/setup/status", setupHandler.GetStatus)
|
router.GET("/setup/status", setupHandler.GetStatus)
|
||||||
|
|
||||||
|
settingsHandler := handlers.NewSettingsHandler(local)
|
||||||
|
router.GET("/api/settings/ui", settingsHandler.GetUI)
|
||||||
|
router.PUT("/api/settings/ui", settingsHandler.PutUI)
|
||||||
|
|
||||||
// Health check
|
// Health check
|
||||||
router.GET("/health", func(c *gin.Context) {
|
router.GET("/health", func(c *gin.Context) {
|
||||||
c.JSON(http.StatusOK, gin.H{
|
c.JSON(http.StatusOK, gin.H{
|
||||||
@@ -892,6 +896,11 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
router.POST("/setup/test", setupHandler.TestConnection)
|
router.POST("/setup/test", setupHandler.TestConnection)
|
||||||
router.GET("/setup/status", setupHandler.GetStatus)
|
router.GET("/setup/status", setupHandler.GetStatus)
|
||||||
|
|
||||||
|
// Per-client UI display preferences
|
||||||
|
settingsHandler := handlers.NewSettingsHandler(local)
|
||||||
|
router.GET("/api/settings/ui", settingsHandler.GetUI)
|
||||||
|
router.PUT("/api/settings/ui", settingsHandler.PutUI)
|
||||||
|
|
||||||
// Web pages
|
// Web pages
|
||||||
router.GET("/", webHandler.Index)
|
router.GET("/", webHandler.Index)
|
||||||
router.GET("/configs", webHandler.Configs)
|
router.GET("/configs", webHandler.Configs)
|
||||||
@@ -1077,6 +1086,7 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
}
|
}
|
||||||
c.JSON(http.StatusOK, gin.H{
|
c.JSON(http.StatusOK, gin.H{
|
||||||
"article": result.Article,
|
"article": result.Article,
|
||||||
|
"segments": result.Segments,
|
||||||
"warnings": result.Warnings,
|
"warnings": result.Warnings,
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@@ -1101,16 +1111,11 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
|
|
||||||
config, err := configService.UpdateNoAuth(uuid, &req)
|
config, err := configService.UpdateNoAuth(uuid, &req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
switch {
|
respondByErrCase(c, err,
|
||||||
case errors.Is(err, services.ErrConfigNotFound):
|
errCase{services.ErrConfigNotFound, http.StatusNotFound, "resource not found"},
|
||||||
respondError(c, http.StatusNotFound, "resource not found", err)
|
errCase{services.ErrProjectNotFound, http.StatusNotFound, "resource not found"},
|
||||||
case errors.Is(err, services.ErrProjectNotFound):
|
errCase{services.ErrProjectForbidden, http.StatusForbidden, "access denied"},
|
||||||
respondError(c, http.StatusNotFound, "resource not found", err)
|
)
|
||||||
case errors.Is(err, services.ErrProjectForbidden):
|
|
||||||
respondError(c, http.StatusForbidden, "access denied", err)
|
|
||||||
default:
|
|
||||||
respondError(c, http.StatusInternalServerError, "internal server error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1217,16 +1222,11 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
}
|
}
|
||||||
updated, err := configService.SetProjectNoAuth(uuid, req.ProjectUUID)
|
updated, err := configService.SetProjectNoAuth(uuid, req.ProjectUUID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
switch {
|
respondByErrCase(c, err,
|
||||||
case errors.Is(err, services.ErrConfigNotFound):
|
errCase{services.ErrConfigNotFound, http.StatusNotFound, "resource not found"},
|
||||||
respondError(c, http.StatusNotFound, "resource not found", err)
|
errCase{services.ErrProjectNotFound, http.StatusNotFound, "resource not found"},
|
||||||
case errors.Is(err, services.ErrProjectNotFound):
|
errCase{services.ErrProjectForbidden, http.StatusForbidden, "access denied"},
|
||||||
respondError(c, http.StatusNotFound, "resource not found", err)
|
)
|
||||||
case errors.Is(err, services.ErrProjectForbidden):
|
|
||||||
respondError(c, http.StatusForbidden, "access denied", err)
|
|
||||||
default:
|
|
||||||
respondError(c, http.StatusInternalServerError, "internal server error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
c.JSON(http.StatusOK, updated)
|
c.JSON(http.StatusOK, updated)
|
||||||
@@ -1354,12 +1354,9 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
}
|
}
|
||||||
config, err := configService.UpdateRentalNoAuth(c.Param("uuid"), &req)
|
config, err := configService.UpdateRentalNoAuth(c.Param("uuid"), &req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
switch {
|
respondByErrCase(c, err,
|
||||||
case errors.Is(err, services.ErrConfigNotFound):
|
errCase{services.ErrConfigNotFound, http.StatusNotFound, "resource not found"},
|
||||||
respondError(c, http.StatusNotFound, "resource not found", err)
|
)
|
||||||
default:
|
|
||||||
respondError(c, http.StatusInternalServerError, "internal server error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
c.JSON(http.StatusOK, config)
|
c.JSON(http.StatusOK, config)
|
||||||
@@ -1373,12 +1370,9 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
}
|
}
|
||||||
result, err := rentalService.Calculate(c.Param("uuid"), &req)
|
result, err := rentalService.Calculate(c.Param("uuid"), &req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
switch {
|
respondByErrCase(c, err,
|
||||||
case errors.Is(err, services.ErrConfigNotFound):
|
errCase{services.ErrConfigNotFound, http.StatusNotFound, "resource not found"},
|
||||||
respondError(c, http.StatusNotFound, "resource not found", err)
|
)
|
||||||
default:
|
|
||||||
respondError(c, http.StatusInternalServerError, "internal server error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
c.JSON(http.StatusOK, result)
|
c.JSON(http.StatusOK, result)
|
||||||
@@ -1590,31 +1584,43 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
|
|
||||||
// Return simplified list of all projects (UUID + Name only)
|
// Return simplified list of all projects (UUID + Name only)
|
||||||
type ProjectSimple struct {
|
type ProjectSimple struct {
|
||||||
UUID string `json:"uuid"`
|
UUID string `json:"uuid"`
|
||||||
Code string `json:"code"`
|
Code string `json:"code"`
|
||||||
Variant string `json:"variant"`
|
Variant string `json:"variant"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
IsActive bool `json:"is_active"`
|
IsActive bool `json:"is_active"`
|
||||||
RentalEnabled bool `json:"rental_enabled"`
|
RentalEnabled bool `json:"rental_enabled"`
|
||||||
CreatedAt time.Time `json:"created_at"`
|
ShowStockPrices bool `json:"show_stock_prices"`
|
||||||
|
OnlyInStock bool `json:"only_in_stock"`
|
||||||
|
CreatedAt time.Time `json:"created_at"`
|
||||||
}
|
}
|
||||||
|
|
||||||
simplified := make([]ProjectSimple, 0, len(allProjects))
|
simplified := make([]ProjectSimple, 0, len(allProjects))
|
||||||
for _, p := range allProjects {
|
for _, p := range allProjects {
|
||||||
simplified = append(simplified, ProjectSimple{
|
simplified = append(simplified, ProjectSimple{
|
||||||
UUID: p.UUID,
|
UUID: p.UUID,
|
||||||
Code: p.Code,
|
Code: p.Code,
|
||||||
Variant: p.Variant,
|
Variant: p.Variant,
|
||||||
Name: derefString(p.Name),
|
Name: derefString(p.Name),
|
||||||
IsActive: p.IsActive,
|
IsActive: p.IsActive,
|
||||||
RentalEnabled: p.RentalEnabled,
|
RentalEnabled: p.RentalEnabled,
|
||||||
CreatedAt: p.CreatedAt,
|
ShowStockPrices: p.ShowStockPrices,
|
||||||
|
OnlyInStock: p.OnlyInStock,
|
||||||
|
CreatedAt: p.CreatedAt,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
c.JSON(http.StatusOK, simplified)
|
c.JSON(http.StatusOK, simplified)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// ProjectWithWarning flattens a project's fields (via embedding) alongside an
|
||||||
|
// optional variant_warning, set when an invalid variant name (reserved "main" or
|
||||||
|
// disallowed characters) was auto-converted into a valid one instead of rejected.
|
||||||
|
type ProjectWithWarning struct {
|
||||||
|
*models.Project
|
||||||
|
VariantWarning string `json:"variant_warning,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
projects.POST("", func(c *gin.Context) {
|
projects.POST("", func(c *gin.Context) {
|
||||||
var req services.CreateProjectRequest
|
var req services.CreateProjectRequest
|
||||||
if err := c.ShouldBindJSON(&req); err != nil {
|
if err := c.ShouldBindJSON(&req); err != nil {
|
||||||
@@ -1625,34 +1631,24 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
c.JSON(http.StatusBadRequest, gin.H{"error": "project code is required"})
|
c.JSON(http.StatusBadRequest, gin.H{"error": "project code is required"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
project, err := projectService.Create(dbUsername, &req)
|
project, variantWarning, err := projectService.Create(dbUsername, &req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
switch {
|
respondByErrCase(c, err,
|
||||||
case errors.Is(err, services.ErrReservedMainVariant),
|
errCase{services.ErrProjectCodeInvalidChars, http.StatusBadRequest, "invalid request"},
|
||||||
errors.Is(err, services.ErrProjectCodeInvalidChars),
|
errCase{services.ErrProjectCodeExists, http.StatusConflict, "conflict detected"},
|
||||||
errors.Is(err, services.ErrProjectVariantInvalidChars):
|
)
|
||||||
respondError(c, http.StatusBadRequest, "invalid request", err)
|
|
||||||
case errors.Is(err, services.ErrProjectCodeExists):
|
|
||||||
respondError(c, http.StatusConflict, "conflict detected", err)
|
|
||||||
default:
|
|
||||||
respondError(c, http.StatusInternalServerError, "internal server error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
c.JSON(http.StatusCreated, project)
|
c.JSON(http.StatusCreated, ProjectWithWarning{Project: project, VariantWarning: variantWarning})
|
||||||
})
|
})
|
||||||
|
|
||||||
projects.GET("/:uuid", func(c *gin.Context) {
|
projects.GET("/:uuid", func(c *gin.Context) {
|
||||||
project, err := projectService.GetByUUID(c.Param("uuid"), dbUsername)
|
project, err := projectService.GetByUUID(c.Param("uuid"), dbUsername)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
switch {
|
respondByErrCase(c, err,
|
||||||
case errors.Is(err, services.ErrProjectNotFound):
|
errCase{services.ErrProjectNotFound, http.StatusNotFound, "resource not found"},
|
||||||
respondError(c, http.StatusNotFound, "resource not found", err)
|
errCase{services.ErrProjectForbidden, http.StatusForbidden, "access denied"},
|
||||||
case errors.Is(err, services.ErrProjectForbidden):
|
)
|
||||||
respondError(c, http.StatusForbidden, "access denied", err)
|
|
||||||
default:
|
|
||||||
respondError(c, http.StatusInternalServerError, "internal server error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
c.JSON(http.StatusOK, project)
|
c.JSON(http.StatusOK, project)
|
||||||
@@ -1664,38 +1660,26 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
respondError(c, http.StatusBadRequest, "invalid request", err)
|
respondError(c, http.StatusBadRequest, "invalid request", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
project, err := projectService.Update(c.Param("uuid"), dbUsername, &req)
|
project, variantWarning, err := projectService.Update(c.Param("uuid"), dbUsername, &req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
switch {
|
respondByErrCase(c, err,
|
||||||
case errors.Is(err, services.ErrReservedMainVariant),
|
errCase{services.ErrCannotRenameMainVariant, http.StatusBadRequest, "invalid request"},
|
||||||
errors.Is(err, services.ErrCannotRenameMainVariant),
|
errCase{services.ErrProjectCodeInvalidChars, http.StatusBadRequest, "invalid request"},
|
||||||
errors.Is(err, services.ErrProjectCodeInvalidChars),
|
errCase{services.ErrProjectCodeExists, http.StatusConflict, "conflict detected"},
|
||||||
errors.Is(err, services.ErrProjectVariantInvalidChars):
|
errCase{services.ErrProjectNotFound, http.StatusNotFound, "resource not found"},
|
||||||
respondError(c, http.StatusBadRequest, "invalid request", err)
|
errCase{services.ErrProjectForbidden, http.StatusForbidden, "access denied"},
|
||||||
case errors.Is(err, services.ErrProjectCodeExists):
|
)
|
||||||
respondError(c, http.StatusConflict, "conflict detected", err)
|
|
||||||
case errors.Is(err, services.ErrProjectNotFound):
|
|
||||||
respondError(c, http.StatusNotFound, "resource not found", err)
|
|
||||||
case errors.Is(err, services.ErrProjectForbidden):
|
|
||||||
respondError(c, http.StatusForbidden, "access denied", err)
|
|
||||||
default:
|
|
||||||
respondError(c, http.StatusInternalServerError, "internal server error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
c.JSON(http.StatusOK, project)
|
c.JSON(http.StatusOK, ProjectWithWarning{Project: project, VariantWarning: variantWarning})
|
||||||
})
|
})
|
||||||
|
|
||||||
projects.POST("/:uuid/archive", func(c *gin.Context) {
|
projects.POST("/:uuid/archive", func(c *gin.Context) {
|
||||||
if err := projectService.Archive(c.Param("uuid"), dbUsername); err != nil {
|
if err := projectService.Archive(c.Param("uuid"), dbUsername); err != nil {
|
||||||
switch {
|
respondByErrCase(c, err,
|
||||||
case errors.Is(err, services.ErrProjectNotFound):
|
errCase{services.ErrProjectNotFound, http.StatusNotFound, "resource not found"},
|
||||||
respondError(c, http.StatusNotFound, "resource not found", err)
|
errCase{services.ErrProjectForbidden, http.StatusForbidden, "access denied"},
|
||||||
case errors.Is(err, services.ErrProjectForbidden):
|
)
|
||||||
respondError(c, http.StatusForbidden, "access denied", err)
|
|
||||||
default:
|
|
||||||
respondError(c, http.StatusInternalServerError, "internal server error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
c.JSON(http.StatusOK, gin.H{"message": "project archived"})
|
c.JSON(http.StatusOK, gin.H{"message": "project archived"})
|
||||||
@@ -1703,14 +1687,10 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
|
|
||||||
projects.POST("/:uuid/reactivate", func(c *gin.Context) {
|
projects.POST("/:uuid/reactivate", func(c *gin.Context) {
|
||||||
if err := projectService.Reactivate(c.Param("uuid"), dbUsername); err != nil {
|
if err := projectService.Reactivate(c.Param("uuid"), dbUsername); err != nil {
|
||||||
switch {
|
respondByErrCase(c, err,
|
||||||
case errors.Is(err, services.ErrProjectNotFound):
|
errCase{services.ErrProjectNotFound, http.StatusNotFound, "resource not found"},
|
||||||
respondError(c, http.StatusNotFound, "resource not found", err)
|
errCase{services.ErrProjectForbidden, http.StatusForbidden, "access denied"},
|
||||||
case errors.Is(err, services.ErrProjectForbidden):
|
)
|
||||||
respondError(c, http.StatusForbidden, "access denied", err)
|
|
||||||
default:
|
|
||||||
respondError(c, http.StatusInternalServerError, "internal server error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
c.JSON(http.StatusOK, gin.H{"message": "project reactivated"})
|
c.JSON(http.StatusOK, gin.H{"message": "project reactivated"})
|
||||||
@@ -1718,16 +1698,11 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
|
|
||||||
projects.DELETE("/:uuid", func(c *gin.Context) {
|
projects.DELETE("/:uuid", func(c *gin.Context) {
|
||||||
if err := projectService.DeleteVariant(c.Param("uuid"), dbUsername); err != nil {
|
if err := projectService.DeleteVariant(c.Param("uuid"), dbUsername); err != nil {
|
||||||
switch {
|
respondByErrCase(c, err,
|
||||||
case errors.Is(err, services.ErrCannotDeleteMainVariant):
|
errCase{services.ErrCannotDeleteMainVariant, http.StatusBadRequest, "invalid request"},
|
||||||
respondError(c, http.StatusBadRequest, "invalid request", err)
|
errCase{services.ErrProjectNotFound, http.StatusNotFound, "resource not found"},
|
||||||
case errors.Is(err, services.ErrProjectNotFound):
|
errCase{services.ErrProjectForbidden, http.StatusForbidden, "access denied"},
|
||||||
respondError(c, http.StatusNotFound, "resource not found", err)
|
)
|
||||||
case errors.Is(err, services.ErrProjectForbidden):
|
|
||||||
respondError(c, http.StatusForbidden, "access denied", err)
|
|
||||||
default:
|
|
||||||
respondError(c, http.StatusInternalServerError, "internal server error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
c.JSON(http.StatusOK, gin.H{"message": "variant deleted"})
|
c.JSON(http.StatusOK, gin.H{"message": "variant deleted"})
|
||||||
@@ -1744,14 +1719,10 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
|
|
||||||
result, err := projectService.ListConfigurations(c.Param("uuid"), dbUsername, status)
|
result, err := projectService.ListConfigurations(c.Param("uuid"), dbUsername, status)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
switch {
|
respondByErrCase(c, err,
|
||||||
case errors.Is(err, services.ErrProjectNotFound):
|
errCase{services.ErrProjectNotFound, http.StatusNotFound, "resource not found"},
|
||||||
respondError(c, http.StatusNotFound, "resource not found", err)
|
errCase{services.ErrProjectForbidden, http.StatusForbidden, "access denied"},
|
||||||
case errors.Is(err, services.ErrProjectForbidden):
|
)
|
||||||
respondError(c, http.StatusForbidden, "access denied", err)
|
|
||||||
default:
|
|
||||||
respondError(c, http.StatusInternalServerError, "internal server error", err)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"git.mchus.pro/mchus/quoteforge/internal/handlers"
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
)
|
||||||
|
|
||||||
|
// errCase maps a sentinel error to the HTTP status/message respondByErrCase
|
||||||
|
// should use when errors.Is matches it.
|
||||||
|
type errCase struct {
|
||||||
|
err error
|
||||||
|
status int
|
||||||
|
message string
|
||||||
|
}
|
||||||
|
|
||||||
|
// respondByErrCase responds with the status/message of the first matching
|
||||||
|
// case (checked in order), or a 500 "internal server error" fallback when
|
||||||
|
// none match. Centralizes the switch-on-sentinel-error pattern repeated
|
||||||
|
// across the config/project HTTP handlers in this file.
|
||||||
|
func respondByErrCase(c *gin.Context, err error, cases ...errCase) {
|
||||||
|
for _, cs := range cases {
|
||||||
|
if errors.Is(err, cs.err) {
|
||||||
|
handlers.RespondError(c, cs.status, cs.message, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
handlers.RespondError(c, http.StatusInternalServerError, "internal server error", err)
|
||||||
|
}
|
||||||
@@ -21,30 +21,23 @@ const (
|
|||||||
// ResolveDBPath returns the local SQLite path using priority:
|
// ResolveDBPath returns the local SQLite path using priority:
|
||||||
// explicit CLI path > QFS_DB_PATH > OS-specific user state directory.
|
// explicit CLI path > QFS_DB_PATH > OS-specific user state directory.
|
||||||
func ResolveDBPath(explicitPath string) (string, error) {
|
func ResolveDBPath(explicitPath string) (string, error) {
|
||||||
if explicitPath != "" {
|
return resolvePath(explicitPath, envDBPath, defaultDB)
|
||||||
return filepath.Clean(explicitPath), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
if fromEnv := os.Getenv(envDBPath); fromEnv != "" {
|
|
||||||
return filepath.Clean(fromEnv), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
dir, err := defaultStateDir()
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
return filepath.Join(dir, defaultDB), nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ResolveConfigPath returns the config path using priority:
|
// ResolveConfigPath returns the config path using priority:
|
||||||
// explicit CLI path > QFS_CONFIG_PATH > OS-specific user state directory.
|
// explicit CLI path > QFS_CONFIG_PATH > OS-specific user state directory.
|
||||||
func ResolveConfigPath(explicitPath string) (string, error) {
|
func ResolveConfigPath(explicitPath string) (string, error) {
|
||||||
|
return resolvePath(explicitPath, envCfgPath, defaultCfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
// resolvePath returns a path using priority: explicit CLI path > envVar > OS-specific
|
||||||
|
// user state directory joined with defaultFilename.
|
||||||
|
func resolvePath(explicitPath, envVar, defaultFilename string) (string, error) {
|
||||||
if explicitPath != "" {
|
if explicitPath != "" {
|
||||||
return filepath.Clean(explicitPath), nil
|
return filepath.Clean(explicitPath), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if fromEnv := os.Getenv(envCfgPath); fromEnv != "" {
|
if fromEnv := os.Getenv(envVar); fromEnv != "" {
|
||||||
return filepath.Clean(fromEnv), nil
|
return filepath.Clean(fromEnv), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,7 +46,7 @@ func ResolveConfigPath(explicitPath string) (string, error) {
|
|||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
return filepath.Join(dir, defaultCfg), nil
|
return filepath.Join(dir, defaultFilename), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// ResolveConfigPathNearDB returns config path using priority:
|
// ResolveConfigPathNearDB returns config path using priority:
|
||||||
|
|||||||
@@ -42,14 +42,17 @@ func GroupForLotCategory(cat string) (group Group, ok bool) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ResolveLotCategories returns lot_category for each lotName found in local_pricelist_items
|
// ResolveLotCategories returns lot_category for each lotName, read from the component
|
||||||
// for the given server pricelist. Lots not found in the pricelist are omitted from the result —
|
// universe (latest active world ∪ estimate pricelists — the same source the configurator,
|
||||||
// callers must treat a missing key as "no category" and skip that lot.
|
// BOM and pricing tab use, see bible-local/decisions/2026-07-24-component-universe-world-union.md).
|
||||||
func ResolveLotCategories(local *localdb.LocalDB, serverPricelistID uint, lotNames []string) (map[string]string, error) {
|
// It must NOT be scoped to a single pricelist: a world-only LOT is a legitimate cart member
|
||||||
|
// and still carries a real lot_category in the world pricelist. LOTs present in neither
|
||||||
|
// pricelist are omitted — callers treat a missing key as "no category" and skip that lot.
|
||||||
|
func ResolveLotCategories(local *localdb.LocalDB, lotNames []string) (map[string]string, error) {
|
||||||
if local == nil {
|
if local == nil {
|
||||||
return nil, fmt.Errorf("local db is nil")
|
return nil, fmt.Errorf("local db is nil")
|
||||||
}
|
}
|
||||||
cats, err := local.GetLocalLotCategoriesByServerPricelistID(serverPricelistID, lotNames)
|
cats, err := local.GetLocalComponentCategoriesByLotNames(lotNames)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ func TestResolveLotCategories_MissingLotOmitted(t *testing.T) {
|
|||||||
Source: "estimate",
|
Source: "estimate",
|
||||||
Version: "S-2026-02-11-001",
|
Version: "S-2026-02-11-001",
|
||||||
Name: "test",
|
Name: "test",
|
||||||
|
IsActive: true,
|
||||||
CreatedAt: time.Now(),
|
CreatedAt: time.Now(),
|
||||||
SyncedAt: time.Now(),
|
SyncedAt: time.Now(),
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
@@ -35,7 +36,7 @@ func TestResolveLotCategories_MissingLotOmitted(t *testing.T) {
|
|||||||
t.Fatalf("save local items: %v", err)
|
t.Fatalf("save local items: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
cats, err := ResolveLotCategories(local, 1, []string{"CPU_A", "UNKNOWN"})
|
cats, err := ResolveLotCategories(local, []string{"CPU_A", "UNKNOWN"})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("unexpected error: %v", err)
|
t.Fatalf("unexpected error: %v", err)
|
||||||
}
|
}
|
||||||
@@ -76,7 +77,7 @@ func TestResolveLotCategories_ReturnsKnownCategories(t *testing.T) {
|
|||||||
t.Fatalf("save items: %v", err)
|
t.Fatalf("save items: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
cats, err := ResolveLotCategories(local, 1, []string{"CPU_B", "MB_X", "NOT_IN_PL"})
|
cats, err := ResolveLotCategories(local, []string{"CPU_B", "MB_X", "NOT_IN_PL"})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("unexpected error: %v", err)
|
t.Fatalf("unexpected error: %v", err)
|
||||||
}
|
}
|
||||||
@@ -91,6 +92,54 @@ func TestResolveLotCategories_ReturnsKnownCategories(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestResolveLotCategories_WorldOnlyLot covers a LOT that exists only in the world
|
||||||
|
// pricelist (never added to estimate) but is a legitimate cart member. Its real
|
||||||
|
// lot_category must be resolved from the component universe, not dropped.
|
||||||
|
func TestResolveLotCategories_WorldOnlyLot(t *testing.T) {
|
||||||
|
local, err := localdb.New(filepath.Join(t.TempDir(), "local.db"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("init local db: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { _ = local.Close() })
|
||||||
|
|
||||||
|
saved := func(serverID uint, source string, items []localdb.LocalPricelistItem) {
|
||||||
|
if err := local.SaveLocalPricelist(&localdb.LocalPricelist{
|
||||||
|
ServerID: serverID, Source: source, Version: source + "-v1", Name: source,
|
||||||
|
IsActive: true, CreatedAt: time.Now(), SyncedAt: time.Now(),
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatalf("save %s pricelist: %v", source, err)
|
||||||
|
}
|
||||||
|
pl, err := local.GetLocalPricelistByServerID(serverID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("get %s pricelist: %v", source, err)
|
||||||
|
}
|
||||||
|
for i := range items {
|
||||||
|
items[i].PricelistID = pl.ID
|
||||||
|
}
|
||||||
|
if err := local.SaveLocalPricelistItems(items); err != nil {
|
||||||
|
t.Fatalf("save %s items: %v", source, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
saved(1, "estimate", []localdb.LocalPricelistItem{
|
||||||
|
{LotName: "CPU_INTEL_8358", LotCategory: "CPU", Price: 1},
|
||||||
|
})
|
||||||
|
saved(2, "world", []localdb.LocalPricelistItem{
|
||||||
|
{LotName: "CPU_INTEL_8358", LotCategory: "CPU", Price: 1},
|
||||||
|
{LotName: "GPU_NV_RTX_PRO_6000D_SERVER_84GB_PCIE", LotCategory: "GPU", Price: 9900},
|
||||||
|
})
|
||||||
|
|
||||||
|
cats, err := ResolveLotCategories(local, []string{
|
||||||
|
"CPU_INTEL_8358", "GPU_NV_RTX_PRO_6000D_SERVER_84GB_PCIE",
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if cats["GPU_NV_RTX_PRO_6000D_SERVER_84GB_PCIE"] != "GPU" {
|
||||||
|
t.Fatalf("world-only LOT category not resolved: %q", cats["GPU_NV_RTX_PRO_6000D_SERVER_84GB_PCIE"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestGroupForLotCategory(t *testing.T) {
|
func TestGroupForLotCategory(t *testing.T) {
|
||||||
if g, ok := GroupForLotCategory("cpu"); !ok || g != GroupCPU {
|
if g, ok := GroupForLotCategory("cpu"); !ok || g != GroupCPU {
|
||||||
t.Fatalf("expected cpu -> GroupCPU")
|
t.Fatalf("expected cpu -> GroupCPU")
|
||||||
|
|||||||
+198
-149
@@ -11,15 +11,25 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type BuildOptions struct {
|
type BuildOptions struct {
|
||||||
ServerModel string
|
ServerModel string
|
||||||
ServerPricelist *uint
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type BuildResult struct {
|
type BuildResult struct {
|
||||||
Article string
|
Article string
|
||||||
|
Segments []ResultSegment
|
||||||
Warnings []string
|
Warnings []string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ResultSegment is one dash-separated piece of the article, tagged so the UI can
|
||||||
|
// highlight pieces the generator could not fully parse. Recognized is false when
|
||||||
|
// the segment contains a category placeholder (e.g. "GPU" instead of a real model
|
||||||
|
// token) because a lot_name did not match the expected naming shape.
|
||||||
|
type ResultSegment struct {
|
||||||
|
Group string `json:"group"`
|
||||||
|
Text string `json:"text"`
|
||||||
|
Recognized bool `json:"recognized"`
|
||||||
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
reMemGiB = regexp.MustCompile(`(?i)(\d+)\s*(GB|G)`)
|
reMemGiB = regexp.MustCompile(`(?i)(\d+)\s*(GB|G)`)
|
||||||
reMemTiB = regexp.MustCompile(`(?i)(\d+)\s*(TB|T)`)
|
reMemTiB = regexp.MustCompile(`(?i)(\d+)\s*(TB|T)`)
|
||||||
@@ -33,6 +43,17 @@ var (
|
|||||||
type namedSeg struct {
|
type namedSeg struct {
|
||||||
group string // "MODEL","CPU","MEM","GPU","DISK","NET","PSU","SUPPORT"
|
group string // "MODEL","CPU","MEM","GPU","DISK","NET","PSU","SUPPORT"
|
||||||
value string
|
value string
|
||||||
|
// degraded marks a segment whose value contains a category placeholder instead
|
||||||
|
// of a parsed spec token, because some lot_name did not match the expected shape.
|
||||||
|
degraded bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// segmentResult is what each build*Segment helper returns: the rendered value, a
|
||||||
|
// degraded flag, and human-readable warnings that name the offending lot_names.
|
||||||
|
type segmentResult struct {
|
||||||
|
value string
|
||||||
|
degraded bool
|
||||||
|
warnings []string
|
||||||
}
|
}
|
||||||
|
|
||||||
func Build(local *localdb.LocalDB, items []models.ConfigItem, opts BuildOptions) (BuildResult, error) {
|
func Build(local *localdb.LocalDB, items []models.ConfigItem, opts BuildOptions) (BuildResult, error) {
|
||||||
@@ -43,71 +64,59 @@ func Build(local *localdb.LocalDB, items []models.ConfigItem, opts BuildOptions)
|
|||||||
if model == "" {
|
if model == "" {
|
||||||
return BuildResult{}, fmt.Errorf("server_model required")
|
return BuildResult{}, fmt.Errorf("server_model required")
|
||||||
}
|
}
|
||||||
segs = append(segs, namedSeg{"MODEL", model})
|
segs = append(segs, namedSeg{group: "MODEL", value: model})
|
||||||
|
|
||||||
lotNames := make([]string, 0, len(items))
|
lotNames := make([]string, 0, len(items))
|
||||||
for _, it := range items {
|
for _, it := range items {
|
||||||
lotNames = append(lotNames, it.LotName)
|
lotNames = append(lotNames, it.LotName)
|
||||||
}
|
}
|
||||||
|
|
||||||
if opts.ServerPricelist == nil || *opts.ServerPricelist == 0 {
|
cats, err := ResolveLotCategories(local, lotNames)
|
||||||
return BuildResult{}, fmt.Errorf("pricelist_id required for article")
|
|
||||||
}
|
|
||||||
|
|
||||||
cats, err := ResolveLotCategories(local, *opts.ServerPricelist, lotNames)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return BuildResult{}, err
|
return BuildResult{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if cpuSeg := buildCPUSegment(items, cats); cpuSeg != "" {
|
for _, sb := range []struct {
|
||||||
segs = append(segs, namedSeg{"CPU", cpuSeg})
|
group string
|
||||||
}
|
build func([]models.ConfigItem, map[string]string) segmentResult
|
||||||
memSeg, memWarn := buildMemSegment(items, cats)
|
}{
|
||||||
if memWarn != "" {
|
{"CPU", buildCPUSegment},
|
||||||
warnings = append(warnings, memWarn)
|
{"MEM", buildMemSegment},
|
||||||
}
|
{"GPU", buildGPUSegment},
|
||||||
if memSeg != "" {
|
{"DISK", buildDiskSegment},
|
||||||
segs = append(segs, namedSeg{"MEM", memSeg})
|
{"NET", buildNetSegment},
|
||||||
}
|
{"PSU", buildPSUSegment},
|
||||||
if gpuSeg := buildGPUSegment(items, cats); gpuSeg != "" {
|
} {
|
||||||
segs = append(segs, namedSeg{"GPU", gpuSeg})
|
res := sb.build(items, cats)
|
||||||
}
|
warnings = append(warnings, res.warnings...)
|
||||||
diskSeg, diskWarn := buildDiskSegment(items, cats)
|
if res.value != "" {
|
||||||
if diskWarn != "" {
|
segs = append(segs, namedSeg{group: sb.group, value: res.value, degraded: res.degraded})
|
||||||
warnings = append(warnings, diskWarn)
|
}
|
||||||
}
|
|
||||||
if diskSeg != "" {
|
|
||||||
segs = append(segs, namedSeg{"DISK", diskSeg})
|
|
||||||
}
|
|
||||||
netSeg, netWarn := buildNetSegment(items, cats)
|
|
||||||
if netWarn != "" {
|
|
||||||
warnings = append(warnings, netWarn)
|
|
||||||
}
|
|
||||||
if netSeg != "" {
|
|
||||||
segs = append(segs, namedSeg{"NET", netSeg})
|
|
||||||
}
|
|
||||||
psuSeg, psuWarn := buildPSUSegment(items, cats)
|
|
||||||
if psuWarn != "" {
|
|
||||||
warnings = append(warnings, psuWarn)
|
|
||||||
}
|
|
||||||
if psuSeg != "" {
|
|
||||||
segs = append(segs, namedSeg{"PSU", psuSeg})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if supportSeg := buildSupportSegment(items); supportSeg != "" {
|
if supportSeg := buildSupportSegment(items); supportSeg != "" {
|
||||||
segs = append(segs, namedSeg{"SUPPORT", supportSeg})
|
segs = append(segs, namedSeg{group: "SUPPORT", value: supportSeg})
|
||||||
}
|
}
|
||||||
|
|
||||||
article := strings.Join(namedSegsValues(segs), "-")
|
article := strings.Join(namedSegsValues(segs), "-")
|
||||||
if len([]rune(article)) > 80 {
|
if len([]rune(article)) > 80 {
|
||||||
article = compressArticle(segs)
|
segs = compressArticle(segs)
|
||||||
|
article = strings.Join(namedSegsValues(segs), "-")
|
||||||
warnings = append(warnings, "compressed")
|
warnings = append(warnings, "compressed")
|
||||||
}
|
}
|
||||||
if len([]rune(article)) > 80 {
|
if len([]rune(article)) > 80 {
|
||||||
return BuildResult{}, fmt.Errorf("article_overflow")
|
return BuildResult{}, fmt.Errorf("article_overflow")
|
||||||
}
|
}
|
||||||
|
|
||||||
return BuildResult{Article: article, Warnings: warnings}, nil
|
result := BuildResult{Article: article, Warnings: warnings}
|
||||||
|
for _, s := range segs {
|
||||||
|
result.Segments = append(result.Segments, ResultSegment{
|
||||||
|
Group: s.group,
|
||||||
|
Text: s.value,
|
||||||
|
Recognized: !s.degraded,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func namedSegsValues(segs []namedSeg) []string {
|
func namedSegsValues(segs []namedSeg) []string {
|
||||||
@@ -145,38 +154,43 @@ func buildSupportSegment(items []models.ConfigItem) string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildCPUSegment(items []models.ConfigItem, cats map[string]string) string {
|
// placeholderToken returns the token used in the article when a lot's spec can't be
|
||||||
type agg struct {
|
// parsed: the lot_category itself (never a bare "UNK"), uppercased.
|
||||||
qty int
|
func placeholderToken(cat string) string {
|
||||||
|
t := strings.ToUpper(strings.TrimSpace(cat))
|
||||||
|
if t == "" {
|
||||||
|
return "X"
|
||||||
}
|
}
|
||||||
models := map[string]*agg{}
|
return t
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildCPUSegment(items []models.ConfigItem, cats map[string]string) segmentResult {
|
||||||
|
models := map[string]int{}
|
||||||
|
res := segmentResult{}
|
||||||
for _, it := range items {
|
for _, it := range items {
|
||||||
group, ok := GroupForLotCategory(cats[it.LotName])
|
group, ok := GroupForLotCategory(cats[it.LotName])
|
||||||
if !ok || group != GroupCPU {
|
if !ok || group != GroupCPU {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
model := parseCPUModel(it.LotName)
|
model, parsed := parseCPUModel(it.LotName)
|
||||||
if model == "" {
|
if !parsed {
|
||||||
model = "UNK"
|
model = placeholderToken(cats[it.LotName])
|
||||||
|
res.degraded = true
|
||||||
|
res.warnings = append(res.warnings, fmt.Sprintf("CPU: не распознана модель LOT %q — в артикул записана категория %q", it.LotName, model))
|
||||||
}
|
}
|
||||||
if _, ok := models[model]; !ok {
|
models[model] += it.Quantity
|
||||||
models[model] = &agg{}
|
|
||||||
}
|
|
||||||
models[model].qty += it.Quantity
|
|
||||||
}
|
}
|
||||||
if len(models) == 0 {
|
if len(models) == 0 {
|
||||||
return ""
|
return res
|
||||||
}
|
}
|
||||||
parts := make([]string, 0, len(models))
|
res.value = joinQtyTokens(models)
|
||||||
for model, a := range models {
|
return res
|
||||||
parts = append(parts, fmt.Sprintf("%dx%s", a.qty, model))
|
|
||||||
}
|
|
||||||
sort.Strings(parts)
|
|
||||||
return strings.Join(parts, "+")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildMemSegment(items []models.ConfigItem, cats map[string]string) (string, string) {
|
func buildMemSegment(items []models.ConfigItem, cats map[string]string) segmentResult {
|
||||||
totalGiB := 0
|
totalGiB := 0
|
||||||
|
res := segmentResult{}
|
||||||
|
unparsed := 0
|
||||||
for _, it := range items {
|
for _, it := range items {
|
||||||
group, ok := GroupForLotCategory(cats[it.LotName])
|
group, ok := GroupForLotCategory(cats[it.LotName])
|
||||||
if !ok || group != GroupMEM {
|
if !ok || group != GroupMEM {
|
||||||
@@ -184,21 +198,31 @@ func buildMemSegment(items []models.ConfigItem, cats map[string]string) (string,
|
|||||||
}
|
}
|
||||||
per := parseMemGiB(it.LotName)
|
per := parseMemGiB(it.LotName)
|
||||||
if per <= 0 {
|
if per <= 0 {
|
||||||
return "", "mem_unknown"
|
unparsed++
|
||||||
|
res.degraded = true
|
||||||
|
res.warnings = append(res.warnings, fmt.Sprintf("MEM: не распознан объём LOT %q", it.LotName))
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
totalGiB += per * it.Quantity
|
totalGiB += per * it.Quantity
|
||||||
}
|
}
|
||||||
if totalGiB == 0 {
|
parts := make([]string, 0, 2)
|
||||||
return "", ""
|
if totalGiB > 0 {
|
||||||
|
if totalGiB%1024 == 0 {
|
||||||
|
parts = append(parts, fmt.Sprintf("%dT", totalGiB/1024))
|
||||||
|
} else {
|
||||||
|
parts = append(parts, fmt.Sprintf("%dG", totalGiB))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if totalGiB%1024 == 0 {
|
if unparsed > 0 {
|
||||||
return fmt.Sprintf("%dT", totalGiB/1024), ""
|
parts = append(parts, placeholderToken("MEM"))
|
||||||
}
|
}
|
||||||
return fmt.Sprintf("%dG", totalGiB), ""
|
res.value = strings.Join(parts, "+")
|
||||||
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildGPUSegment(items []models.ConfigItem, cats map[string]string) string {
|
func buildGPUSegment(items []models.ConfigItem, cats map[string]string) segmentResult {
|
||||||
models := map[string]int{}
|
models := map[string]int{}
|
||||||
|
res := segmentResult{}
|
||||||
for _, it := range items {
|
for _, it := range items {
|
||||||
group, ok := GroupForLotCategory(cats[it.LotName])
|
group, ok := GroupForLotCategory(cats[it.LotName])
|
||||||
if !ok || group != GroupGPU {
|
if !ok || group != GroupGPU {
|
||||||
@@ -207,30 +231,28 @@ func buildGPUSegment(items []models.ConfigItem, cats map[string]string) string {
|
|||||||
if strings.HasPrefix(strings.ToUpper(it.LotName), "MB_") {
|
if strings.HasPrefix(strings.ToUpper(it.LotName), "MB_") {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
model := parseGPUModel(it.LotName)
|
model, parsed := parseGPUModel(it.LotName)
|
||||||
if model == "" {
|
if !parsed {
|
||||||
model = "UNK"
|
model = placeholderToken(cats[it.LotName])
|
||||||
|
res.degraded = true
|
||||||
|
res.warnings = append(res.warnings, fmt.Sprintf("GPU: не распознана модель LOT %q — в артикул записана категория %q", it.LotName, model))
|
||||||
}
|
}
|
||||||
models[model] += it.Quantity
|
models[model] += it.Quantity
|
||||||
}
|
}
|
||||||
if len(models) == 0 {
|
if len(models) == 0 {
|
||||||
return ""
|
return res
|
||||||
}
|
}
|
||||||
parts := make([]string, 0, len(models))
|
res.value = joinQtyTokens(models)
|
||||||
for model, qty := range models {
|
return res
|
||||||
parts = append(parts, fmt.Sprintf("%dx%s", qty, model))
|
|
||||||
}
|
|
||||||
sort.Strings(parts)
|
|
||||||
return strings.Join(parts, "+")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildDiskSegment(items []models.ConfigItem, cats map[string]string) (string, string) {
|
func buildDiskSegment(items []models.ConfigItem, cats map[string]string) segmentResult {
|
||||||
type key struct {
|
type key struct {
|
||||||
t string
|
t string
|
||||||
c string
|
c string
|
||||||
}
|
}
|
||||||
groupQty := map[key]int{}
|
groupQty := map[key]int{}
|
||||||
warn := ""
|
res := segmentResult{}
|
||||||
for _, it := range items {
|
for _, it := range items {
|
||||||
group, ok := GroupForLotCategory(cats[it.LotName])
|
group, ok := GroupForLotCategory(cats[it.LotName])
|
||||||
if !ok || group != GroupDISK {
|
if !ok || group != GroupDISK {
|
||||||
@@ -238,14 +260,14 @@ func buildDiskSegment(items []models.ConfigItem, cats map[string]string) (string
|
|||||||
}
|
}
|
||||||
capToken := parseCapacity(it.LotName)
|
capToken := parseCapacity(it.LotName)
|
||||||
if capToken == "" {
|
if capToken == "" {
|
||||||
warn = "disk_unknown"
|
res.degraded = true
|
||||||
|
res.warnings = append(res.warnings, fmt.Sprintf("DISK: не распознан объём LOT %q", it.LotName))
|
||||||
}
|
}
|
||||||
typeCode := diskTypeCode(cats[it.LotName], it.LotName)
|
typeCode := diskTypeCode(cats[it.LotName], it.LotName)
|
||||||
k := key{t: typeCode, c: capToken}
|
groupQty[key{t: typeCode, c: capToken}] += it.Quantity
|
||||||
groupQty[k] += it.Quantity
|
|
||||||
}
|
}
|
||||||
if len(groupQty) == 0 {
|
if len(groupQty) == 0 {
|
||||||
return "", ""
|
return res
|
||||||
}
|
}
|
||||||
parts := make([]string, 0, len(groupQty))
|
parts := make([]string, 0, len(groupQty))
|
||||||
for k, qty := range groupQty {
|
for k, qty := range groupQty {
|
||||||
@@ -256,59 +278,53 @@ func buildDiskSegment(items []models.ConfigItem, cats map[string]string) (string
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
sort.Strings(parts)
|
sort.Strings(parts)
|
||||||
return strings.Join(parts, "+"), warn
|
res.value = strings.Join(parts, "+")
|
||||||
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildNetSegment(items []models.ConfigItem, cats map[string]string) (string, string) {
|
func buildNetSegment(items []models.ConfigItem, cats map[string]string) segmentResult {
|
||||||
|
return buildProfileSegment(items, cats, GroupNET, parsePortSpeed, "NET")
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildPSUSegment(items []models.ConfigItem, cats map[string]string) segmentResult {
|
||||||
|
return buildProfileSegment(items, cats, GroupPSU, parseWatts, "PSU")
|
||||||
|
}
|
||||||
|
|
||||||
|
// buildProfileSegment groups items of the given category group by a profile token
|
||||||
|
// parsed from their lot name (e.g. port speed, wattage rating). When a lot's profile
|
||||||
|
// can't be determined it falls back to the category placeholder and flags the segment
|
||||||
|
// as degraded, naming the lot in a warning.
|
||||||
|
func buildProfileSegment(items []models.ConfigItem, cats map[string]string, group Group, parseProfile func(string) string, groupLabel string) segmentResult {
|
||||||
groupQty := map[string]int{}
|
groupQty := map[string]int{}
|
||||||
warn := ""
|
res := segmentResult{}
|
||||||
for _, it := range items {
|
for _, it := range items {
|
||||||
group, ok := GroupForLotCategory(cats[it.LotName])
|
g, ok := GroupForLotCategory(cats[it.LotName])
|
||||||
if !ok || group != GroupNET {
|
if !ok || g != group {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
profile := parsePortSpeed(it.LotName)
|
profile := parseProfile(it.LotName)
|
||||||
if profile == "" {
|
if profile == "" {
|
||||||
profile = "UNKNET"
|
profile = placeholderToken(groupLabel)
|
||||||
warn = "net_unknown"
|
res.degraded = true
|
||||||
|
res.warnings = append(res.warnings, fmt.Sprintf("%s: не распознан профиль LOT %q — в артикул записана категория %q", groupLabel, it.LotName, profile))
|
||||||
}
|
}
|
||||||
groupQty[profile] += it.Quantity
|
groupQty[profile] += it.Quantity
|
||||||
}
|
}
|
||||||
if len(groupQty) == 0 {
|
if len(groupQty) == 0 {
|
||||||
return "", ""
|
return res
|
||||||
}
|
}
|
||||||
parts := make([]string, 0, len(groupQty))
|
res.value = joinQtyTokens(groupQty)
|
||||||
for profile, qty := range groupQty {
|
return res
|
||||||
parts = append(parts, fmt.Sprintf("%dx%s", qty, profile))
|
|
||||||
}
|
|
||||||
sort.Strings(parts)
|
|
||||||
return strings.Join(parts, "+"), warn
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildPSUSegment(items []models.ConfigItem, cats map[string]string) (string, string) {
|
// joinQtyTokens renders {token: qty} as a sorted "NxTOKEN+MxTOKEN" string.
|
||||||
groupQty := map[string]int{}
|
func joinQtyTokens(qty map[string]int) string {
|
||||||
warn := ""
|
parts := make([]string, 0, len(qty))
|
||||||
for _, it := range items {
|
for token, n := range qty {
|
||||||
group, ok := GroupForLotCategory(cats[it.LotName])
|
parts = append(parts, fmt.Sprintf("%dx%s", n, token))
|
||||||
if !ok || group != GroupPSU {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
rating := parseWatts(it.LotName)
|
|
||||||
if rating == "" {
|
|
||||||
rating = "UNKPSU"
|
|
||||||
warn = "psu_unknown"
|
|
||||||
}
|
|
||||||
groupQty[rating] += it.Quantity
|
|
||||||
}
|
|
||||||
if len(groupQty) == 0 {
|
|
||||||
return "", ""
|
|
||||||
}
|
|
||||||
parts := make([]string, 0, len(groupQty))
|
|
||||||
for rating, qty := range groupQty {
|
|
||||||
parts = append(parts, fmt.Sprintf("%dx%s", qty, rating))
|
|
||||||
}
|
}
|
||||||
sort.Strings(parts)
|
sort.Strings(parts)
|
||||||
return strings.Join(parts, "+"), warn
|
return strings.Join(parts, "+")
|
||||||
}
|
}
|
||||||
|
|
||||||
func normalizeModelToken(lotName string) string {
|
func normalizeModelToken(lotName string) string {
|
||||||
@@ -320,18 +336,27 @@ func normalizeModelToken(lotName string) string {
|
|||||||
return strings.ToUpper(strings.TrimSpace(token))
|
return strings.ToUpper(strings.TrimSpace(token))
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseCPUModel(lotName string) string {
|
// parseCPUModel extracts the model token from a CPU lot_name (shape
|
||||||
|
// CPU_{VENDOR}_{MODEL}, e.g. "CPU_INTEL_8592+"). The bool is false when the name
|
||||||
|
// has no parseable {VENDOR}_{MODEL} tail — a structural failure the caller surfaces.
|
||||||
|
// It cannot validate that the token is a real CPU model (no vendor catalog is kept
|
||||||
|
// in the repo by design), only that the name matched the expected shape.
|
||||||
|
func parseCPUModel(lotName string) (string, bool) {
|
||||||
parts := strings.Split(lotName, "_")
|
parts := strings.Split(lotName, "_")
|
||||||
if len(parts) >= 2 {
|
if len(parts) >= 2 {
|
||||||
last := strings.ToUpper(strings.TrimSpace(parts[len(parts)-1]))
|
last := strings.ToUpper(strings.TrimSpace(parts[len(parts)-1]))
|
||||||
if last != "" {
|
if last != "" {
|
||||||
return last
|
return last, true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return normalizeModelToken(lotName)
|
return normalizeModelToken(lotName), false
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseGPUModel(lotName string) string {
|
// parseGPUModel extracts a "MODEL[_MEM]" token from a GPU lot_name. The bool is
|
||||||
|
// false when no model token could be located and the result is only the last-ditch
|
||||||
|
// last-underscore-segment fallback — a structural failure the caller surfaces.
|
||||||
|
// Like parseCPUModel it does not validate the token against a catalog.
|
||||||
|
func parseGPUModel(lotName string) (string, bool) {
|
||||||
upper := strings.ToUpper(lotName)
|
upper := strings.ToUpper(lotName)
|
||||||
if idx := strings.Index(upper, "GPU_"); idx >= 0 {
|
if idx := strings.Index(upper, "GPU_"); idx >= 0 {
|
||||||
upper = upper[idx+4:]
|
upper = upper[idx+4:]
|
||||||
@@ -362,7 +387,7 @@ func parseGPUModel(lotName string) string {
|
|||||||
}
|
}
|
||||||
if model == "" && i > 0 {
|
if model == "" && i > 0 {
|
||||||
model = p
|
model = p
|
||||||
} else if model != "" && numSuffix == "" && isNumeric(p) {
|
} else if model != "" && numSuffix == "" && isModelNumber(p) {
|
||||||
numSuffix = p
|
numSuffix = p
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -372,20 +397,24 @@ func parseGPUModel(lotName string) string {
|
|||||||
full = model + numSuffix
|
full = model + numSuffix
|
||||||
}
|
}
|
||||||
if full != "" && mem != "" {
|
if full != "" && mem != "" {
|
||||||
return full + "_" + mem
|
return full + "_" + mem, true
|
||||||
}
|
}
|
||||||
if full != "" {
|
if full != "" {
|
||||||
return full
|
return full, true
|
||||||
}
|
}
|
||||||
return normalizeModelToken(lotName)
|
return normalizeModelToken(lotName), false
|
||||||
}
|
}
|
||||||
|
|
||||||
func isNumeric(s string) bool {
|
// isModelNumber reports whether s looks like a GPU/accelerator model number token:
|
||||||
if s == "" {
|
// it starts with a digit and contains only digits and uppercase letters. This keeps
|
||||||
|
// vendor-suffixed names like "6000D" (RTX PRO 6000D) intact instead of dropping the
|
||||||
|
// letter and collapsing two distinct models to the same token.
|
||||||
|
func isModelNumber(s string) bool {
|
||||||
|
if s == "" || s[0] < '0' || s[0] > '9' {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
for _, r := range s {
|
for _, r := range s {
|
||||||
if r < '0' || r > '9' {
|
if (r < '0' || r > '9') && (r < 'A' || r > 'Z') {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -437,9 +466,28 @@ func parsePortSpeed(lotName string) string {
|
|||||||
if m := rePortFC.FindStringSubmatch(lotName); len(m) == 3 {
|
if m := rePortFC.FindStringSubmatch(lotName); len(m) == 3 {
|
||||||
return fmt.Sprintf("%spFC%s", m[1], m[2])
|
return fmt.Sprintf("%spFC%s", m[1], m[2])
|
||||||
}
|
}
|
||||||
|
if model := parseDPUModel(lotName); model != "" {
|
||||||
|
return model
|
||||||
|
}
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// parseDPUModel extracts the "{FAMILY}_{MODEL}" tail from a DPU lot_name (shape
|
||||||
|
// DPU_{FAMILY}_{MODEL}, e.g. "DPU_BF3_B3220-32G" -> "BF3_B3220-32G"). DPU lots have
|
||||||
|
// no port-speed suffix like NIC/HCA, so they fall through parsePortSpeed's regexes;
|
||||||
|
// this keeps the family prefix (e.g. BF2 vs BF3) so distinct DPU generations sharing
|
||||||
|
// a part-number suffix don't collapse into the same article token. Like parseCPUModel
|
||||||
|
// it does not validate against a vendor catalog, only matches the expected shape.
|
||||||
|
func parseDPUModel(lotName string) string {
|
||||||
|
upper := strings.ToUpper(lotName)
|
||||||
|
const prefix = "DPU_"
|
||||||
|
if !strings.HasPrefix(upper, prefix) {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
rest := strings.TrimSpace(upper[len(prefix):])
|
||||||
|
return rest
|
||||||
|
}
|
||||||
|
|
||||||
func parseWatts(lotName string) string {
|
func parseWatts(lotName string) string {
|
||||||
if m := reWatts.FindStringSubmatch(lotName); len(m) == 2 {
|
if m := reWatts.FindStringSubmatch(lotName); len(m) == 2 {
|
||||||
w := atoi(m[1])
|
w := atoi(m[1])
|
||||||
@@ -493,42 +541,43 @@ func atoi(v string) int {
|
|||||||
return n
|
return n
|
||||||
}
|
}
|
||||||
|
|
||||||
func compressArticle(segs []namedSeg) string {
|
// compressArticle shortens an over-long article by progressively dropping/abbreviating
|
||||||
|
// segments. It returns the (possibly shortened) segment list; the caller re-joins it.
|
||||||
|
func compressArticle(segs []namedSeg) []namedSeg {
|
||||||
if len(segs) == 0 {
|
if len(segs) == 0 {
|
||||||
return ""
|
return segs
|
||||||
|
}
|
||||||
|
fits := func() bool {
|
||||||
|
return len([]rune(strings.Join(namedSegsValues(segs), "-"))) <= 80
|
||||||
}
|
}
|
||||||
for i, s := range segs {
|
for i, s := range segs {
|
||||||
segs[i].value = strings.ReplaceAll(s.value, "GbE", "G")
|
segs[i].value = strings.ReplaceAll(s.value, "GbE", "G")
|
||||||
}
|
}
|
||||||
article := strings.Join(namedSegsValues(segs), "-")
|
if fits() {
|
||||||
if len([]rune(article)) <= 80 {
|
return segs
|
||||||
return article
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 1) remove PSU
|
// 1) remove PSU
|
||||||
if i := findSegGroup(segs, "PSU"); i >= 0 {
|
if i := findSegGroup(segs, "PSU"); i >= 0 {
|
||||||
segs = append(segs[:i], segs[i+1:]...)
|
segs = append(segs[:i], segs[i+1:]...)
|
||||||
article = strings.Join(namedSegsValues(segs), "-")
|
if fits() {
|
||||||
if len([]rune(article)) <= 80 {
|
return segs
|
||||||
return article
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2) compress NET/HBA/HCA
|
// 2) compress NET/HBA/HCA
|
||||||
if i := findSegGroup(segs, "NET"); i >= 0 {
|
if i := findSegGroup(segs, "NET"); i >= 0 {
|
||||||
segs[i].value = compressNetSegment(segs[i].value)
|
segs[i].value = compressNetSegment(segs[i].value)
|
||||||
article = strings.Join(namedSegsValues(segs), "-")
|
if fits() {
|
||||||
if len([]rune(article)) <= 80 {
|
return segs
|
||||||
return article
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3) compress DISK
|
// 3) compress DISK
|
||||||
if i := findSegGroup(segs, "DISK"); i >= 0 {
|
if i := findSegGroup(segs, "DISK"); i >= 0 {
|
||||||
segs[i].value = compressDiskSegment(segs[i].value)
|
segs[i].value = compressDiskSegment(segs[i].value)
|
||||||
article = strings.Join(namedSegsValues(segs), "-")
|
if fits() {
|
||||||
if len([]rune(article)) <= 80 {
|
return segs
|
||||||
return article
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -536,7 +585,7 @@ func compressArticle(segs []namedSeg) string {
|
|||||||
if i := findSegGroup(segs, "GPU"); i >= 0 {
|
if i := findSegGroup(segs, "GPU"); i >= 0 {
|
||||||
segs[i].value = compressGPUSegment(segs[i].value)
|
segs[i].value = compressGPUSegment(segs[i].value)
|
||||||
}
|
}
|
||||||
return strings.Join(namedSegsValues(segs), "-")
|
return segs
|
||||||
}
|
}
|
||||||
|
|
||||||
func compressNetSegment(seg string) string {
|
func compressNetSegment(seg string) string {
|
||||||
|
|||||||
@@ -47,8 +47,7 @@ func TestBuild_ParsesNetAndPSU(t *testing.T) {
|
|||||||
{LotName: "SVC_1yW_x86", Quantity: 1},
|
{LotName: "SVC_1yW_x86", Quantity: 1},
|
||||||
}
|
}
|
||||||
result, err := Build(local, items, BuildOptions{
|
result, err := Build(local, items, BuildOptions{
|
||||||
ServerModel: "DL380GEN11",
|
ServerModel: "DL380GEN11",
|
||||||
ServerPricelist: &localPL.ServerID,
|
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("build article: %v", err)
|
t.Fatalf("build article: %v", err)
|
||||||
@@ -118,8 +117,7 @@ func TestBuild_CompressArticle_NoGPU_PSUNotNIC(t *testing.T) {
|
|||||||
{LotName: "PS_1500W_Platinum", Quantity: 2},
|
{LotName: "PS_1500W_Platinum", Quantity: 2},
|
||||||
}
|
}
|
||||||
result, err := Build(local, items, BuildOptions{
|
result, err := Build(local, items, BuildOptions{
|
||||||
ServerModel: "NF5280M6",
|
ServerModel: "NF5280M6",
|
||||||
ServerPricelist: &localPL.ServerID,
|
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("build article: %v", err)
|
t.Fatalf("build article: %v", err)
|
||||||
@@ -140,3 +138,122 @@ func TestBuild_CompressArticle_NoGPU_PSUNotNIC(t *testing.T) {
|
|||||||
func contains(s, sub string) bool {
|
func contains(s, sub string) bool {
|
||||||
return strings.Contains(s, sub)
|
return strings.Contains(s, sub)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestParsePortSpeed_DPUModel(t *testing.T) {
|
||||||
|
cases := map[string]string{
|
||||||
|
"DPU_BF3_B3220-32G": "BF3_B3220-32G",
|
||||||
|
"DPU_BF2_B2220Q": "BF2_B2220Q",
|
||||||
|
}
|
||||||
|
for in, want := range cases {
|
||||||
|
if got := parsePortSpeed(in); got != want {
|
||||||
|
t.Errorf("parsePortSpeed(%q) = %q, want %q", in, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestBuild_ParsesDPU verifies a DPU lot (e.g. NVIDIA BlueField) resolves to its
|
||||||
|
// family+model token instead of falling back to the "NET" category placeholder —
|
||||||
|
// DPU lots don't carry a NIC/HCA-style port-speed suffix, so parsePortSpeed needs
|
||||||
|
// its own DPU branch (parseDPUModel).
|
||||||
|
func TestBuild_ParsesDPU(t *testing.T) {
|
||||||
|
local, err := localdb.New(filepath.Join(t.TempDir(), "local.db"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("init local db: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { _ = local.Close() })
|
||||||
|
|
||||||
|
if err := local.SaveLocalPricelist(&localdb.LocalPricelist{
|
||||||
|
ServerID: 10, Source: "estimate", Version: "v1", Name: "t",
|
||||||
|
IsActive: true, CreatedAt: time.Now(), SyncedAt: time.Now(),
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatalf("save pricelist: %v", err)
|
||||||
|
}
|
||||||
|
pl, err := local.GetLocalPricelistByServerID(10)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("get pricelist: %v", err)
|
||||||
|
}
|
||||||
|
if err := local.SaveLocalPricelistItems([]localdb.LocalPricelistItem{
|
||||||
|
{PricelistID: pl.ID, LotName: "DPU_BF3_B3220-32G", LotCategory: "DPU", Price: 1},
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatalf("save items: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := Build(local, models.ConfigItems{
|
||||||
|
{LotName: "DPU_BF3_B3220-32G", Quantity: 1},
|
||||||
|
}, BuildOptions{ServerModel: "X1"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("build: %v", err)
|
||||||
|
}
|
||||||
|
if len(result.Warnings) != 0 {
|
||||||
|
t.Fatalf("expected no warnings, got %v", result.Warnings)
|
||||||
|
}
|
||||||
|
if !contains(result.Article, "BF3_B3220-32G") {
|
||||||
|
t.Fatalf("expected DPU model token in article: %s", result.Article)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseGPUModel_VendorLetterSuffix(t *testing.T) {
|
||||||
|
cases := map[string]string{
|
||||||
|
"GPU_NV_RTX_PRO_6000D_SERVER_84GB_PCIE": "RTX6000D_84GB",
|
||||||
|
"GPU_NV_RTX_PRO_6000_SERVER_96GB_PCIE": "RTX6000_96GB",
|
||||||
|
}
|
||||||
|
for in, want := range cases {
|
||||||
|
got, ok := parseGPUModel(in)
|
||||||
|
if !ok || got != want {
|
||||||
|
t.Errorf("parseGPUModel(%q) = %q, %v, want %q, true", in, got, ok, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestBuild_UnparseableModel_CategoryPlaceholder: a GPU LOT whose name does not
|
||||||
|
// match the expected shape must not silently vanish or emit "UNK" — the article
|
||||||
|
// carries the category token and the segment is flagged not-recognized with a
|
||||||
|
// warning naming the lot.
|
||||||
|
func TestBuild_UnparseableModel_CategoryPlaceholder(t *testing.T) {
|
||||||
|
local, err := localdb.New(filepath.Join(t.TempDir(), "local.db"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("init local db: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { _ = local.Close() })
|
||||||
|
|
||||||
|
if err := local.SaveLocalPricelist(&localdb.LocalPricelist{
|
||||||
|
ServerID: 9, Source: "estimate", Version: "v1", Name: "t",
|
||||||
|
IsActive: true, CreatedAt: time.Now(), SyncedAt: time.Now(),
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatalf("save pricelist: %v", err)
|
||||||
|
}
|
||||||
|
pl, err := local.GetLocalPricelistByServerID(9)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("get pricelist: %v", err)
|
||||||
|
}
|
||||||
|
if err := local.SaveLocalPricelistItems([]localdb.LocalPricelistItem{
|
||||||
|
{PricelistID: pl.ID, LotName: "WEIRDGPUNAME", LotCategory: "GPU", Price: 1},
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatalf("save items: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := Build(local, models.ConfigItems{
|
||||||
|
{LotName: "WEIRDGPUNAME", Quantity: 4},
|
||||||
|
}, BuildOptions{ServerModel: "X1"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("build: %v", err)
|
||||||
|
}
|
||||||
|
if contains(result.Article, "UNK") {
|
||||||
|
t.Fatalf("article must not contain UNK: %s", result.Article)
|
||||||
|
}
|
||||||
|
if !contains(result.Article, "4xGPU") {
|
||||||
|
t.Fatalf("expected category placeholder 4xGPU in article: %s", result.Article)
|
||||||
|
}
|
||||||
|
var gpu *ResultSegment
|
||||||
|
for i := range result.Segments {
|
||||||
|
if result.Segments[i].Group == "GPU" {
|
||||||
|
gpu = &result.Segments[i]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if gpu == nil || gpu.Recognized {
|
||||||
|
t.Fatalf("GPU segment must be present and not recognized: %+v", result.Segments)
|
||||||
|
}
|
||||||
|
if len(result.Warnings) == 0 || !contains(strings.Join(result.Warnings, "|"), "WEIRDGPUNAME") {
|
||||||
|
t.Fatalf("expected a warning naming WEIRDGPUNAME, got %v", result.Warnings)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -55,6 +55,15 @@ type ProjectExportOptionsRequest struct {
|
|||||||
IncludeCompetitor bool `json:"include_competitor"`
|
IncludeCompetitor bool `json:"include_competitor"`
|
||||||
Basis string `json:"basis"` // "fob" or "ddp"
|
Basis string `json:"basis"` // "fob" or "ddp"
|
||||||
SaleMarkup float64 `json:"sale_markup"` // DDP multiplier; 0 defaults to 1.3
|
SaleMarkup float64 `json:"sale_markup"` // DDP multiplier; 0 defaults to 1.3
|
||||||
|
|
||||||
|
ManualPrice *float64 `json:"manual_price"` // user-defined total price; distributed proportionally across rows
|
||||||
|
|
||||||
|
// MinimalSaleColumns/SaleRowMarkups are sent only by the single-config Sale-table
|
||||||
|
// "Экспорт CSV" button (index.html exportPricingCSV('sale')) — never by the Buy
|
||||||
|
// export or the project-level bulk export, which always leave these zero-valued so
|
||||||
|
// their output stays unchanged. See services.ProjectPricingExportOptions.
|
||||||
|
MinimalSaleColumns bool `json:"minimal_sale_columns"`
|
||||||
|
SaleRowMarkups map[string]float64 `json:"sale_row_markups"` // "<vendorPN>::<lot>" -> markup percent
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *ExportHandler) ExportCSV(c *gin.Context) {
|
func (h *ExportHandler) ExportCSV(c *gin.Context) {
|
||||||
@@ -238,15 +247,31 @@ func (h *ExportHandler) ExportConfigPricingCSV(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var project *models.Project
|
||||||
|
if config.ProjectUUID != nil && *config.ProjectUUID != "" {
|
||||||
|
if p, err := h.projectService.GetByUUID(*config.ProjectUUID, h.dbUsername); err == nil {
|
||||||
|
project = p
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
opts := services.ProjectPricingExportOptions{
|
opts := services.ProjectPricingExportOptions{
|
||||||
IncludeLOT: req.IncludeLOT,
|
IncludeLOT: req.IncludeLOT,
|
||||||
IncludeBOM: req.IncludeBOM,
|
IncludeBOM: req.IncludeBOM,
|
||||||
IncludeEstimate: req.IncludeEstimate,
|
IncludeEstimate: req.IncludeEstimate,
|
||||||
IncludeStock: req.IncludeStock,
|
IncludeStock: req.IncludeStock && project != nil && project.ShowStockPrices,
|
||||||
IncludeCompetitor: req.IncludeCompetitor,
|
IncludeCompetitor: req.IncludeCompetitor,
|
||||||
Basis: req.Basis,
|
Basis: req.Basis,
|
||||||
SaleMarkup: req.SaleMarkup,
|
SaleMarkup: req.SaleMarkup,
|
||||||
}
|
}
|
||||||
|
// MinimalSaleColumns/SaleRowMarkups/ManualPrice are only ever sent by the Sale
|
||||||
|
// table's own "Экспорт CSV" button (index.html exportPricingCSV('sale')) — gating
|
||||||
|
// on the request's own flag keeps every other caller (Buy export, any other basis=
|
||||||
|
// ddp caller) byte-identical to before this field existed.
|
||||||
|
if req.MinimalSaleColumns {
|
||||||
|
opts.MinimalSaleColumns = true
|
||||||
|
opts.SaleRowMarkups = req.SaleRowMarkups
|
||||||
|
opts.ManualPrice = req.ManualPrice
|
||||||
|
}
|
||||||
|
|
||||||
data, err := h.exportService.ConfigToPricingExportData(config, opts)
|
data, err := h.exportService.ConfigToPricingExportData(config, opts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -260,10 +285,8 @@ func (h *ExportHandler) ExportConfigPricingCSV(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
projectCode := config.Name
|
projectCode := config.Name
|
||||||
if config.ProjectUUID != nil && *config.ProjectUUID != "" {
|
if project != nil {
|
||||||
if project, err := h.projectService.GetByUUID(*config.ProjectUUID, h.dbUsername); err == nil && project != nil {
|
projectCode = project.Code
|
||||||
projectCode = project.Code
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
filename := fmt.Sprintf("%s (%s) %s %s SPEC.csv",
|
filename := fmt.Sprintf("%s (%s) %s %s SPEC.csv",
|
||||||
@@ -309,7 +332,7 @@ func (h *ExportHandler) ExportProjectPricingCSV(c *gin.Context) {
|
|||||||
IncludeLOT: req.IncludeLOT,
|
IncludeLOT: req.IncludeLOT,
|
||||||
IncludeBOM: req.IncludeBOM,
|
IncludeBOM: req.IncludeBOM,
|
||||||
IncludeEstimate: req.IncludeEstimate,
|
IncludeEstimate: req.IncludeEstimate,
|
||||||
IncludeStock: req.IncludeStock,
|
IncludeStock: req.IncludeStock && project.ShowStockPrices,
|
||||||
IncludeCompetitor: req.IncludeCompetitor,
|
IncludeCompetitor: req.IncludeCompetitor,
|
||||||
Basis: req.Basis,
|
Basis: req.Basis,
|
||||||
SaleMarkup: req.SaleMarkup,
|
SaleMarkup: req.SaleMarkup,
|
||||||
|
|||||||
@@ -16,13 +16,12 @@ func NewQuoteHandler(quoteService *services.QuoteService) *QuoteHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (h *QuoteHandler) Validate(c *gin.Context) {
|
func (h *QuoteHandler) Validate(c *gin.Context) {
|
||||||
var req services.QuoteRequest
|
req, ok := BindJSON[services.QuoteRequest](c)
|
||||||
if err := c.ShouldBindJSON(&req); err != nil {
|
if !ok {
|
||||||
RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
result, err := h.quoteService.ValidateAndCalculate(&req)
|
result, err := h.quoteService.ValidateAndCalculate(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
|
RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
|
||||||
return
|
return
|
||||||
@@ -32,13 +31,12 @@ func (h *QuoteHandler) Validate(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (h *QuoteHandler) Calculate(c *gin.Context) {
|
func (h *QuoteHandler) Calculate(c *gin.Context) {
|
||||||
var req services.QuoteRequest
|
req, ok := BindJSON[services.QuoteRequest](c)
|
||||||
if err := c.ShouldBindJSON(&req); err != nil {
|
if !ok {
|
||||||
RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
result, err := h.quoteService.ValidateAndCalculate(&req)
|
result, err := h.quoteService.ValidateAndCalculate(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
|
RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
|
||||||
return
|
return
|
||||||
@@ -51,13 +49,12 @@ func (h *QuoteHandler) Calculate(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (h *QuoteHandler) PriceLevels(c *gin.Context) {
|
func (h *QuoteHandler) PriceLevels(c *gin.Context) {
|
||||||
var req services.PriceLevelsRequest
|
req, ok := BindJSON[services.PriceLevelsRequest](c)
|
||||||
if err := c.ShouldBindJSON(&req); err != nil {
|
if !ok {
|
||||||
RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
result, err := h.quoteService.CalculatePriceLevels(&req)
|
result, err := h.quoteService.CalculatePriceLevels(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
|
RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"io"
|
"io"
|
||||||
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
@@ -16,6 +17,17 @@ func RespondError(c *gin.Context, status int, fallback string, err error) {
|
|||||||
c.JSON(status, gin.H{"error": clientFacingErrorMessage(status, fallback, err)})
|
c.JSON(status, gin.H{"error": clientFacingErrorMessage(status, fallback, err)})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// BindJSON decodes the request body into T, responding with a 422 and writing
|
||||||
|
// the error via RespondError on failure. The second return value reports success.
|
||||||
|
func BindJSON[T any](c *gin.Context) (*T, bool) {
|
||||||
|
var req T
|
||||||
|
if err := c.ShouldBindJSON(&req); err != nil {
|
||||||
|
RespondError(c, http.StatusUnprocessableEntity, "invalid request", err)
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
return &req, true
|
||||||
|
}
|
||||||
|
|
||||||
func clientFacingErrorMessage(status int, fallback string, err error) string {
|
func clientFacingErrorMessage(status int, fallback string, err error) string {
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return fallback
|
return fallback
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
package handlers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"git.mchus.pro/mchus/quoteforge/internal/localdb"
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
)
|
||||||
|
|
||||||
|
// SettingsHandler serves per-client UI display preferences stored in app_settings.
|
||||||
|
type SettingsHandler struct {
|
||||||
|
localDB *localdb.LocalDB
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewSettingsHandler(localDB *localdb.LocalDB) *SettingsHandler {
|
||||||
|
return &SettingsHandler{localDB: localDB}
|
||||||
|
}
|
||||||
|
|
||||||
|
type uiSettingsResponse struct {
|
||||||
|
IndicatorMode string `json:"indicator_mode"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUI returns the current UI display preferences.
|
||||||
|
func (h *SettingsHandler) GetUI(c *gin.Context) {
|
||||||
|
c.JSON(http.StatusOK, uiSettingsResponse{
|
||||||
|
IndicatorMode: h.localDB.GetIndicatorMode(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// PutUI updates UI display preferences. Currently only indicator_mode.
|
||||||
|
func (h *SettingsHandler) PutUI(c *gin.Context) {
|
||||||
|
req, ok := BindJSON[struct {
|
||||||
|
IndicatorMode string `json:"indicator_mode"`
|
||||||
|
}](c)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := h.localDB.SetIndicatorMode(req.IndicatorMode); err != nil {
|
||||||
|
RespondError(c, http.StatusUnprocessableEntity, "invalid indicator_mode", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, uiSettingsResponse{
|
||||||
|
IndicatorMode: h.localDB.GetIndicatorMode(),
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -10,6 +10,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
qfassets "git.mchus.pro/mchus/quoteforge"
|
qfassets "git.mchus.pro/mchus/quoteforge"
|
||||||
|
"git.mchus.pro/mchus/quoteforge/internal/appmeta"
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/db"
|
"git.mchus.pro/mchus/quoteforge/internal/db"
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/localdb"
|
"git.mchus.pro/mchus/quoteforge/internal/localdb"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
@@ -56,7 +57,9 @@ func (h *SetupHandler) ShowSetup(c *gin.Context) {
|
|||||||
settings, _ := h.localDB.GetSettings()
|
settings, _ := h.localDB.GetSettings()
|
||||||
|
|
||||||
data := gin.H{
|
data := gin.H{
|
||||||
"Settings": settings,
|
"Settings": settings,
|
||||||
|
"IndicatorMode": h.localDB.GetIndicatorMode(),
|
||||||
|
"AppVersion": appmeta.Version(),
|
||||||
}
|
}
|
||||||
|
|
||||||
tmpl := h.templates["setup.html"]
|
tmpl := h.templates["setup.html"]
|
||||||
@@ -207,4 +210,3 @@ func buildMySQLDSN(host string, port int, database, user, password string, timeo
|
|||||||
}
|
}
|
||||||
return cfg.FormatDSN()
|
return cfg.FormatDSN()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,6 +114,10 @@ func NewWebHandler(_ string, localDB *localdb.LocalDB) (*WebHandler, error) {
|
|||||||
|
|
||||||
func (h *WebHandler) render(c *gin.Context, name string, data gin.H) {
|
func (h *WebHandler) render(c *gin.Context, name string, data gin.H) {
|
||||||
data["AppVersion"] = appmeta.Version()
|
data["AppVersion"] = appmeta.Version()
|
||||||
|
data["IndicatorMode"] = localdb.IndicatorModeColor
|
||||||
|
if h.localDB != nil {
|
||||||
|
data["IndicatorMode"] = h.localDB.GetIndicatorMode()
|
||||||
|
}
|
||||||
c.Header("Content-Type", "text/html; charset=utf-8")
|
c.Header("Content-Type", "text/html; charset=utf-8")
|
||||||
tmpl, ok := h.templates[name]
|
tmpl, ok := h.templates[name]
|
||||||
if !ok {
|
if !ok {
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ func TestConfigurationConvertersPreserveBusinessFields(t *testing.T) {
|
|||||||
WarehousePricelistID: &warehouseID,
|
WarehousePricelistID: &warehouseID,
|
||||||
CompetitorPricelistID: &competitorID,
|
CompetitorPricelistID: &competitorID,
|
||||||
DisablePriceRefresh: true,
|
DisablePriceRefresh: true,
|
||||||
OnlyInStock: true,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
local := ConfigurationToLocal(cfg)
|
local := ConfigurationToLocal(cfg)
|
||||||
@@ -57,7 +56,6 @@ func TestConfigurationSnapshotPreservesBusinessFields(t *testing.T) {
|
|||||||
WarehousePricelistID: &warehouseID,
|
WarehousePricelistID: &warehouseID,
|
||||||
CompetitorPricelistID: &competitorID,
|
CompetitorPricelistID: &competitorID,
|
||||||
DisablePriceRefresh: true,
|
DisablePriceRefresh: true,
|
||||||
OnlyInStock: true,
|
|
||||||
VendorSpec: VendorSpec{
|
VendorSpec: VendorSpec{
|
||||||
{
|
{
|
||||||
SortOrder: 10,
|
SortOrder: 10,
|
||||||
@@ -110,7 +108,6 @@ func TestConfigurationFingerprintIncludesPricingSelectorsAndVendorSpec(t *testin
|
|||||||
WarehousePricelistID: &warehouseID,
|
WarehousePricelistID: &warehouseID,
|
||||||
CompetitorPricelistID: &competitorID,
|
CompetitorPricelistID: &competitorID,
|
||||||
DisablePriceRefresh: true,
|
DisablePriceRefresh: true,
|
||||||
OnlyInStock: true,
|
|
||||||
VendorSpec: VendorSpec{
|
VendorSpec: VendorSpec{
|
||||||
{
|
{
|
||||||
SortOrder: 10,
|
SortOrder: 10,
|
||||||
|
|||||||
@@ -73,7 +73,6 @@ func ConfigurationToLocal(cfg *models.Configuration) *LocalConfiguration {
|
|||||||
ConfigType: cfg.ConfigType,
|
ConfigType: cfg.ConfigType,
|
||||||
VendorSpec: modelVendorSpecToLocal(cfg.VendorSpec),
|
VendorSpec: modelVendorSpecToLocal(cfg.VendorSpec),
|
||||||
DisablePriceRefresh: cfg.DisablePriceRefresh,
|
DisablePriceRefresh: cfg.DisablePriceRefresh,
|
||||||
OnlyInStock: cfg.OnlyInStock,
|
|
||||||
RentalItems: modelRentalItemsToLocal(cfg.RentalItems),
|
RentalItems: modelRentalItemsToLocal(cfg.RentalItems),
|
||||||
RentalUpliftPercent: cfg.RentalUpliftPercent,
|
RentalUpliftPercent: cfg.RentalUpliftPercent,
|
||||||
Line: cfg.Line,
|
Line: cfg.Line,
|
||||||
@@ -124,7 +123,6 @@ func LocalToConfiguration(local *LocalConfiguration) *models.Configuration {
|
|||||||
ConfigType: local.ConfigType,
|
ConfigType: local.ConfigType,
|
||||||
VendorSpec: localVendorSpecToModel(local.VendorSpec),
|
VendorSpec: localVendorSpecToModel(local.VendorSpec),
|
||||||
DisablePriceRefresh: local.DisablePriceRefresh,
|
DisablePriceRefresh: local.DisablePriceRefresh,
|
||||||
OnlyInStock: local.OnlyInStock,
|
|
||||||
RentalItems: localRentalItemsToModel(local.RentalItems),
|
RentalItems: localRentalItemsToModel(local.RentalItems),
|
||||||
RentalUpliftPercent: local.RentalUpliftPercent,
|
RentalUpliftPercent: local.RentalUpliftPercent,
|
||||||
Line: local.Line,
|
Line: local.Line,
|
||||||
@@ -259,18 +257,20 @@ func localRentalItemsToModel(items RentalItemConditions) models.RentalItemCondit
|
|||||||
|
|
||||||
func ProjectToLocal(project *models.Project) *LocalProject {
|
func ProjectToLocal(project *models.Project) *LocalProject {
|
||||||
local := &LocalProject{
|
local := &LocalProject{
|
||||||
UUID: project.UUID,
|
UUID: project.UUID,
|
||||||
OwnerUsername: project.OwnerUsername,
|
OwnerUsername: project.OwnerUsername,
|
||||||
Code: project.Code,
|
Code: project.Code,
|
||||||
Variant: project.Variant,
|
Variant: project.Variant,
|
||||||
Name: project.Name,
|
Name: project.Name,
|
||||||
TrackerURL: project.TrackerURL,
|
TrackerURL: project.TrackerURL,
|
||||||
IsActive: project.IsActive,
|
IsActive: project.IsActive,
|
||||||
IsSystem: project.IsSystem,
|
IsSystem: project.IsSystem,
|
||||||
RentalEnabled: project.RentalEnabled,
|
RentalEnabled: project.RentalEnabled,
|
||||||
CreatedAt: project.CreatedAt,
|
ShowStockPrices: project.ShowStockPrices,
|
||||||
UpdatedAt: project.UpdatedAt,
|
OnlyInStock: project.OnlyInStock,
|
||||||
SyncStatus: "pending",
|
CreatedAt: project.CreatedAt,
|
||||||
|
UpdatedAt: project.UpdatedAt,
|
||||||
|
SyncStatus: "pending",
|
||||||
}
|
}
|
||||||
if project.ID > 0 {
|
if project.ID > 0 {
|
||||||
serverID := project.ID
|
serverID := project.ID
|
||||||
@@ -281,17 +281,19 @@ func ProjectToLocal(project *models.Project) *LocalProject {
|
|||||||
|
|
||||||
func LocalToProject(local *LocalProject) *models.Project {
|
func LocalToProject(local *LocalProject) *models.Project {
|
||||||
project := &models.Project{
|
project := &models.Project{
|
||||||
UUID: local.UUID,
|
UUID: local.UUID,
|
||||||
OwnerUsername: local.OwnerUsername,
|
OwnerUsername: local.OwnerUsername,
|
||||||
Code: local.Code,
|
Code: local.Code,
|
||||||
Variant: local.Variant,
|
Variant: local.Variant,
|
||||||
Name: local.Name,
|
Name: local.Name,
|
||||||
TrackerURL: local.TrackerURL,
|
TrackerURL: local.TrackerURL,
|
||||||
IsActive: local.IsActive,
|
IsActive: local.IsActive,
|
||||||
IsSystem: local.IsSystem,
|
IsSystem: local.IsSystem,
|
||||||
RentalEnabled: local.RentalEnabled,
|
RentalEnabled: local.RentalEnabled,
|
||||||
CreatedAt: local.CreatedAt,
|
ShowStockPrices: local.ShowStockPrices,
|
||||||
UpdatedAt: local.UpdatedAt,
|
OnlyInStock: local.OnlyInStock,
|
||||||
|
CreatedAt: local.CreatedAt,
|
||||||
|
UpdatedAt: local.UpdatedAt,
|
||||||
}
|
}
|
||||||
if local.ServerID != nil {
|
if local.ServerID != nil {
|
||||||
project.ID = *local.ServerID
|
project.ID = *local.ServerID
|
||||||
|
|||||||
@@ -0,0 +1,45 @@
|
|||||||
|
package localdb
|
||||||
|
|
||||||
|
import (
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func newModeDB(t *testing.T) *LocalDB {
|
||||||
|
t.Helper()
|
||||||
|
local, err := New(filepath.Join(t.TempDir(), "mode.db"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open localdb: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { _ = local.Close() })
|
||||||
|
return local
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIndicatorMode(t *testing.T) {
|
||||||
|
local := newModeDB(t)
|
||||||
|
|
||||||
|
if got := local.GetIndicatorMode(); got != IndicatorModeColor {
|
||||||
|
t.Fatalf("unset: got %q, want %q", got, IndicatorModeColor)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := local.SetIndicatorMode(IndicatorModeAccessible); err != nil {
|
||||||
|
t.Fatalf("set accessible: %v", err)
|
||||||
|
}
|
||||||
|
if got := local.GetIndicatorMode(); got != IndicatorModeAccessible {
|
||||||
|
t.Fatalf("after set accessible: got %q, want %q", got, IndicatorModeAccessible)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := local.SetIndicatorMode(IndicatorModeColor); err != nil {
|
||||||
|
t.Fatalf("set color: %v", err)
|
||||||
|
}
|
||||||
|
if got := local.GetIndicatorMode(); got != IndicatorModeColor {
|
||||||
|
t.Fatalf("after set color: got %q, want %q", got, IndicatorModeColor)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := local.SetIndicatorMode("rainbow"); err == nil {
|
||||||
|
t.Fatal("expected error for invalid mode, got nil")
|
||||||
|
}
|
||||||
|
if got := local.GetIndicatorMode(); got != IndicatorModeColor {
|
||||||
|
t.Fatalf("after rejected set: got %q, want %q", got, IndicatorModeColor)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -212,6 +212,8 @@ CREATE TABLE local_projects (
|
|||||||
is_active INTEGER NOT NULL DEFAULT 1,
|
is_active INTEGER NOT NULL DEFAULT 1,
|
||||||
is_system INTEGER NOT NULL DEFAULT 0,
|
is_system INTEGER NOT NULL DEFAULT 0,
|
||||||
rental_enabled INTEGER NOT NULL DEFAULT 0,
|
rental_enabled INTEGER NOT NULL DEFAULT 0,
|
||||||
|
show_stock_prices INTEGER NOT NULL DEFAULT 0,
|
||||||
|
only_in_stock INTEGER NOT NULL DEFAULT 0,
|
||||||
created_at DATETIME,
|
created_at DATETIME,
|
||||||
updated_at DATETIME,
|
updated_at DATETIME,
|
||||||
synced_at DATETIME NULL,
|
synced_at DATETIME NULL,
|
||||||
@@ -1128,6 +1130,43 @@ func (l *LocalDB) upsertAppSetting(tx *gorm.DB, key, value string, updatedAt tim
|
|||||||
`, key, value, updatedAt.Format(time.RFC3339)).Error
|
`, key, value, updatedAt.Format(time.RFC3339)).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Indicator display mode: how the UI renders signals that are otherwise carried
|
||||||
|
// by colour alone (price-quality scale, world-fallback price cells, incomplete
|
||||||
|
// pricing totals). "color" (default) keeps the hue coding; "accessible" swaps it
|
||||||
|
// for shape/text so it stays readable with a colour-vision deficiency. Per-client
|
||||||
|
// preference stored in app_settings; consumed by web/static/price-quality.js and
|
||||||
|
// the pricing tab via base.html's window.QF_INDICATOR_MODE.
|
||||||
|
const (
|
||||||
|
IndicatorModeColor = "color"
|
||||||
|
IndicatorModeAccessible = "accessible"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetIndicatorMode returns the stored indicator display mode, falling back to
|
||||||
|
// "color" when unset or invalid.
|
||||||
|
func (l *LocalDB) GetIndicatorMode() string {
|
||||||
|
value, ok := l.getAppSettingValue("indicator_mode")
|
||||||
|
if !ok {
|
||||||
|
return IndicatorModeColor
|
||||||
|
}
|
||||||
|
switch strings.TrimSpace(value) {
|
||||||
|
case IndicatorModeAccessible:
|
||||||
|
return IndicatorModeAccessible
|
||||||
|
default:
|
||||||
|
return IndicatorModeColor
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetIndicatorMode stores the indicator display mode. Only the two known
|
||||||
|
// literals are accepted.
|
||||||
|
func (l *LocalDB) SetIndicatorMode(mode string) error {
|
||||||
|
mode = strings.TrimSpace(mode)
|
||||||
|
if mode != IndicatorModeColor && mode != IndicatorModeAccessible {
|
||||||
|
return fmt.Errorf("invalid indicator mode %q", mode)
|
||||||
|
}
|
||||||
|
now := time.Now()
|
||||||
|
return l.upsertAppSetting(l.db, "indicator_mode", mode, now)
|
||||||
|
}
|
||||||
|
|
||||||
// SetLastSyncTime sets the last sync timestamp
|
// SetLastSyncTime sets the last sync timestamp
|
||||||
func (l *LocalDB) SetLastSyncTime(t time.Time) error {
|
func (l *LocalDB) SetLastSyncTime(t time.Time) error {
|
||||||
// Using raw SQL for upsert since SQLite doesn't have native UPSERT in all versions
|
// Using raw SQL for upsert since SQLite doesn't have native UPSERT in all versions
|
||||||
|
|||||||
@@ -139,6 +139,11 @@ var localMigrations = []localMigration{
|
|||||||
name: "Add price_quality to local_pricelist_items",
|
name: "Add price_quality to local_pricelist_items",
|
||||||
run: addLocalPricelistItemPriceQuality,
|
run: addLocalPricelistItemPriceQuality,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
id: "2026_08_12_local_project_stock_settings",
|
||||||
|
name: "Add show_stock_prices and only_in_stock to local_projects",
|
||||||
|
run: addLocalProjectStockSettings,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
func addLocalPricelistItemPriceQuality(tx *gorm.DB) error {
|
func addLocalPricelistItemPriceQuality(tx *gorm.DB) error {
|
||||||
@@ -249,6 +254,22 @@ func addLocalProjectRentalEnabled(tx *gorm.DB) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func addLocalProjectStockSettings(tx *gorm.DB) error {
|
||||||
|
stmts := []string{
|
||||||
|
`ALTER TABLE local_projects ADD COLUMN show_stock_prices INTEGER NOT NULL DEFAULT 0`,
|
||||||
|
`ALTER TABLE local_projects ADD COLUMN only_in_stock INTEGER NOT NULL DEFAULT 0`,
|
||||||
|
}
|
||||||
|
for _, stmt := range stmts {
|
||||||
|
if err := tx.Exec(stmt).Error; err != nil {
|
||||||
|
if !strings.Contains(strings.ToLower(err.Error()), "duplicate") &&
|
||||||
|
!strings.Contains(strings.ToLower(err.Error()), "exists") {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
type localPartnumberCatalogRow struct {
|
type localPartnumberCatalogRow struct {
|
||||||
Partnumber string
|
Partnumber string
|
||||||
LotsJSON LocalPartnumberBookLots
|
LotsJSON LocalPartnumberBookLots
|
||||||
|
|||||||
+17
-16
@@ -111,7 +111,6 @@ type LocalConfiguration struct {
|
|||||||
WarehousePricelistID *uint `gorm:"index" json:"warehouse_pricelist_id,omitempty"`
|
WarehousePricelistID *uint `gorm:"index" json:"warehouse_pricelist_id,omitempty"`
|
||||||
CompetitorPricelistID *uint `gorm:"index" json:"competitor_pricelist_id,omitempty"`
|
CompetitorPricelistID *uint `gorm:"index" json:"competitor_pricelist_id,omitempty"`
|
||||||
DisablePriceRefresh bool `gorm:"default:false" json:"disable_price_refresh"`
|
DisablePriceRefresh bool `gorm:"default:false" json:"disable_price_refresh"`
|
||||||
OnlyInStock bool `gorm:"default:false" json:"only_in_stock"`
|
|
||||||
RentalItems RentalItemConditions `gorm:"type:text" json:"rental_items,omitempty"`
|
RentalItems RentalItemConditions `gorm:"type:text" json:"rental_items,omitempty"`
|
||||||
RentalUpliftPercent float64 `gorm:"default:0" json:"rental_uplift_percent"`
|
RentalUpliftPercent float64 `gorm:"default:0" json:"rental_uplift_percent"`
|
||||||
VendorSpec VendorSpec `gorm:"type:text" json:"vendor_spec,omitempty"`
|
VendorSpec VendorSpec `gorm:"type:text" json:"vendor_spec,omitempty"`
|
||||||
@@ -133,21 +132,23 @@ func (LocalConfiguration) TableName() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type LocalProject struct {
|
type LocalProject struct {
|
||||||
ID uint `gorm:"primaryKey;autoIncrement" json:"id"`
|
ID uint `gorm:"primaryKey;autoIncrement" json:"id"`
|
||||||
UUID string `gorm:"uniqueIndex;not null" json:"uuid"`
|
UUID string `gorm:"uniqueIndex;not null" json:"uuid"`
|
||||||
ServerID *uint `json:"server_id,omitempty"`
|
ServerID *uint `json:"server_id,omitempty"`
|
||||||
OwnerUsername string `gorm:"not null;index" json:"owner_username"`
|
OwnerUsername string `gorm:"not null;index" json:"owner_username"`
|
||||||
Code string `gorm:"not null;index:idx_local_projects_code_variant,priority:1" json:"code"`
|
Code string `gorm:"not null;index:idx_local_projects_code_variant,priority:1" json:"code"`
|
||||||
Variant string `gorm:"default:'';index:idx_local_projects_code_variant,priority:2" json:"variant"`
|
Variant string `gorm:"default:'';index:idx_local_projects_code_variant,priority:2" json:"variant"`
|
||||||
Name *string `json:"name,omitempty"`
|
Name *string `json:"name,omitempty"`
|
||||||
TrackerURL string `json:"tracker_url"`
|
TrackerURL string `json:"tracker_url"`
|
||||||
IsActive bool `gorm:"default:true;index" json:"is_active"`
|
IsActive bool `gorm:"default:true;index" json:"is_active"`
|
||||||
IsSystem bool `gorm:"default:false;index" json:"is_system"`
|
IsSystem bool `gorm:"default:false;index" json:"is_system"`
|
||||||
RentalEnabled bool `gorm:"default:false" json:"rental_enabled"`
|
RentalEnabled bool `gorm:"default:false" json:"rental_enabled"`
|
||||||
CreatedAt time.Time `json:"created_at"`
|
ShowStockPrices bool `gorm:"default:false" json:"show_stock_prices"`
|
||||||
UpdatedAt time.Time `json:"updated_at"`
|
OnlyInStock bool `gorm:"default:false" json:"only_in_stock"`
|
||||||
SyncedAt *time.Time `json:"synced_at,omitempty"`
|
CreatedAt time.Time `json:"created_at"`
|
||||||
SyncStatus string `gorm:"default:'local'" json:"sync_status"` // local/synced/pending
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
|
SyncedAt *time.Time `json:"synced_at,omitempty"`
|
||||||
|
SyncStatus string `gorm:"default:'local'" json:"sync_status"` // local/synced/pending
|
||||||
}
|
}
|
||||||
|
|
||||||
func (LocalProject) TableName() string {
|
func (LocalProject) TableName() string {
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ func BuildConfigurationSnapshot(localCfg *LocalConfiguration) (string, error) {
|
|||||||
"warehouse_pricelist_id": localCfg.WarehousePricelistID,
|
"warehouse_pricelist_id": localCfg.WarehousePricelistID,
|
||||||
"competitor_pricelist_id": localCfg.CompetitorPricelistID,
|
"competitor_pricelist_id": localCfg.CompetitorPricelistID,
|
||||||
"disable_price_refresh": localCfg.DisablePriceRefresh,
|
"disable_price_refresh": localCfg.DisablePriceRefresh,
|
||||||
"only_in_stock": localCfg.OnlyInStock,
|
|
||||||
"rental_items": localCfg.RentalItems,
|
"rental_items": localCfg.RentalItems,
|
||||||
"rental_uplift_percent": localCfg.RentalUpliftPercent,
|
"rental_uplift_percent": localCfg.RentalUpliftPercent,
|
||||||
"vendor_spec": localCfg.VendorSpec,
|
"vendor_spec": localCfg.VendorSpec,
|
||||||
@@ -54,30 +53,29 @@ func BuildConfigurationSnapshot(localCfg *LocalConfiguration) (string, error) {
|
|||||||
// DecodeConfigurationSnapshot returns editable fields from one saved snapshot.
|
// DecodeConfigurationSnapshot returns editable fields from one saved snapshot.
|
||||||
func DecodeConfigurationSnapshot(data string) (*LocalConfiguration, error) {
|
func DecodeConfigurationSnapshot(data string) (*LocalConfiguration, error) {
|
||||||
var snapshot struct {
|
var snapshot struct {
|
||||||
ProjectUUID *string `json:"project_uuid"`
|
ProjectUUID *string `json:"project_uuid"`
|
||||||
IsActive *bool `json:"is_active"`
|
IsActive *bool `json:"is_active"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Items LocalConfigItems `json:"items"`
|
Items LocalConfigItems `json:"items"`
|
||||||
TotalPrice *float64 `json:"total_price"`
|
TotalPrice *float64 `json:"total_price"`
|
||||||
CustomPrice *float64 `json:"custom_price"`
|
CustomPrice *float64 `json:"custom_price"`
|
||||||
Notes string `json:"notes"`
|
Notes string `json:"notes"`
|
||||||
IsTemplate bool `json:"is_template"`
|
IsTemplate bool `json:"is_template"`
|
||||||
ServerCount int `json:"server_count"`
|
ServerCount int `json:"server_count"`
|
||||||
ServerModel string `json:"server_model"`
|
ServerModel string `json:"server_model"`
|
||||||
SupportCode string `json:"support_code"`
|
SupportCode string `json:"support_code"`
|
||||||
Article string `json:"article"`
|
Article string `json:"article"`
|
||||||
PricelistID *uint `json:"pricelist_id"`
|
PricelistID *uint `json:"pricelist_id"`
|
||||||
WarehousePricelistID *uint `json:"warehouse_pricelist_id"`
|
WarehousePricelistID *uint `json:"warehouse_pricelist_id"`
|
||||||
CompetitorPricelistID *uint `json:"competitor_pricelist_id"`
|
CompetitorPricelistID *uint `json:"competitor_pricelist_id"`
|
||||||
DisablePriceRefresh bool `json:"disable_price_refresh"`
|
DisablePriceRefresh bool `json:"disable_price_refresh"`
|
||||||
OnlyInStock bool `json:"only_in_stock"`
|
|
||||||
RentalItems RentalItemConditions `json:"rental_items"`
|
RentalItems RentalItemConditions `json:"rental_items"`
|
||||||
RentalUpliftPercent float64 `json:"rental_uplift_percent"`
|
RentalUpliftPercent float64 `json:"rental_uplift_percent"`
|
||||||
VendorSpec VendorSpec `json:"vendor_spec"`
|
VendorSpec VendorSpec `json:"vendor_spec"`
|
||||||
Line int `json:"line"`
|
Line int `json:"line"`
|
||||||
PriceUpdatedAt *time.Time `json:"price_updated_at"`
|
PriceUpdatedAt *time.Time `json:"price_updated_at"`
|
||||||
OriginalUserID uint `json:"original_user_id"`
|
OriginalUserID uint `json:"original_user_id"`
|
||||||
OriginalUsername string `json:"original_username"`
|
OriginalUsername string `json:"original_username"`
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := json.Unmarshal([]byte(data), &snapshot); err != nil {
|
if err := json.Unmarshal([]byte(data), &snapshot); err != nil {
|
||||||
@@ -106,7 +104,6 @@ func DecodeConfigurationSnapshot(data string) (*LocalConfiguration, error) {
|
|||||||
WarehousePricelistID: snapshot.WarehousePricelistID,
|
WarehousePricelistID: snapshot.WarehousePricelistID,
|
||||||
CompetitorPricelistID: snapshot.CompetitorPricelistID,
|
CompetitorPricelistID: snapshot.CompetitorPricelistID,
|
||||||
DisablePriceRefresh: snapshot.DisablePriceRefresh,
|
DisablePriceRefresh: snapshot.DisablePriceRefresh,
|
||||||
OnlyInStock: snapshot.OnlyInStock,
|
|
||||||
RentalItems: snapshot.RentalItems,
|
RentalItems: snapshot.RentalItems,
|
||||||
RentalUpliftPercent: snapshot.RentalUpliftPercent,
|
RentalUpliftPercent: snapshot.RentalUpliftPercent,
|
||||||
VendorSpec: snapshot.VendorSpec,
|
VendorSpec: snapshot.VendorSpec,
|
||||||
@@ -126,7 +123,6 @@ type configurationSpecPriceFingerprint struct {
|
|||||||
WarehousePricelistID *uint `json:"warehouse_pricelist_id,omitempty"`
|
WarehousePricelistID *uint `json:"warehouse_pricelist_id,omitempty"`
|
||||||
CompetitorPricelistID *uint `json:"competitor_pricelist_id,omitempty"`
|
CompetitorPricelistID *uint `json:"competitor_pricelist_id,omitempty"`
|
||||||
DisablePriceRefresh bool `json:"disable_price_refresh"`
|
DisablePriceRefresh bool `json:"disable_price_refresh"`
|
||||||
OnlyInStock bool `json:"only_in_stock"`
|
|
||||||
RentalItems RentalItemConditions `json:"rental_items,omitempty"`
|
RentalItems RentalItemConditions `json:"rental_items,omitempty"`
|
||||||
RentalUpliftPercent float64 `json:"rental_uplift_percent"`
|
RentalUpliftPercent float64 `json:"rental_uplift_percent"`
|
||||||
VendorSpec VendorSpec `json:"vendor_spec,omitempty"`
|
VendorSpec VendorSpec `json:"vendor_spec,omitempty"`
|
||||||
@@ -174,7 +170,6 @@ func BuildConfigurationSpecPriceFingerprint(localCfg *LocalConfiguration) (strin
|
|||||||
WarehousePricelistID: localCfg.WarehousePricelistID,
|
WarehousePricelistID: localCfg.WarehousePricelistID,
|
||||||
CompetitorPricelistID: localCfg.CompetitorPricelistID,
|
CompetitorPricelistID: localCfg.CompetitorPricelistID,
|
||||||
DisablePriceRefresh: localCfg.DisablePriceRefresh,
|
DisablePriceRefresh: localCfg.DisablePriceRefresh,
|
||||||
OnlyInStock: localCfg.OnlyInStock,
|
|
||||||
RentalItems: rentalItems,
|
RentalItems: rentalItems,
|
||||||
RentalUpliftPercent: localCfg.RentalUpliftPercent,
|
RentalUpliftPercent: localCfg.RentalUpliftPercent,
|
||||||
VendorSpec: localCfg.VendorSpec,
|
VendorSpec: localCfg.VendorSpec,
|
||||||
|
|||||||
@@ -126,38 +126,36 @@ func (v *VendorSpec) Scan(value interface{}) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type Configuration struct {
|
type Configuration struct {
|
||||||
ID uint `gorm:"primaryKey;autoIncrement" json:"id"`
|
ID uint `gorm:"primaryKey;autoIncrement" json:"id"`
|
||||||
UUID string `gorm:"size:36;uniqueIndex;not null" json:"uuid"`
|
UUID string `gorm:"size:36;uniqueIndex;not null" json:"uuid"`
|
||||||
UserID *uint `json:"user_id,omitempty"` // Legacy field, no longer required for ownership
|
UserID *uint `json:"user_id,omitempty"` // Legacy field, no longer required for ownership
|
||||||
OwnerUsername string `gorm:"size:100;not null;default:'';index" json:"owner_username"`
|
OwnerUsername string `gorm:"size:100;not null;default:'';index" json:"owner_username"`
|
||||||
ProjectUUID *string `gorm:"size:36;index" json:"project_uuid,omitempty"`
|
ProjectUUID *string `gorm:"size:36;index" json:"project_uuid,omitempty"`
|
||||||
AppVersion string `gorm:"size:64" json:"app_version,omitempty"`
|
AppVersion string `gorm:"size:64" json:"app_version,omitempty"`
|
||||||
Name string `gorm:"size:200;not null" json:"name"`
|
Name string `gorm:"size:200;not null" json:"name"`
|
||||||
Items ConfigItems `gorm:"type:json;not null" json:"items"`
|
Items ConfigItems `gorm:"type:json;not null" json:"items"`
|
||||||
TotalPrice *float64 `gorm:"type:decimal(12,2)" json:"total_price"`
|
TotalPrice *float64 `gorm:"type:decimal(12,2)" json:"total_price"`
|
||||||
CustomPrice *float64 `gorm:"type:decimal(12,2)" json:"custom_price"`
|
CustomPrice *float64 `gorm:"type:decimal(12,2)" json:"custom_price"`
|
||||||
Notes string `gorm:"type:text" json:"notes"`
|
Notes string `gorm:"type:text" json:"notes"`
|
||||||
IsTemplate bool `gorm:"default:false" json:"is_template"`
|
IsTemplate bool `gorm:"default:false" json:"is_template"`
|
||||||
ServerCount int `gorm:"default:1" json:"server_count"`
|
ServerCount int `gorm:"default:1" json:"server_count"`
|
||||||
ServerModel string `gorm:"size:100" json:"server_model,omitempty"`
|
ServerModel string `gorm:"size:100" json:"server_model,omitempty"`
|
||||||
SupportCode string `gorm:"size:20" json:"support_code,omitempty"`
|
SupportCode string `gorm:"size:20" json:"support_code,omitempty"`
|
||||||
Article string `gorm:"size:80" json:"article,omitempty"`
|
Article string `gorm:"size:80" json:"article,omitempty"`
|
||||||
PricelistID *uint `gorm:"index" json:"pricelist_id,omitempty"`
|
PricelistID *uint `gorm:"index" json:"pricelist_id,omitempty"`
|
||||||
WarehousePricelistID *uint `gorm:"index" json:"warehouse_pricelist_id,omitempty"`
|
WarehousePricelistID *uint `gorm:"index" json:"warehouse_pricelist_id,omitempty"`
|
||||||
CompetitorPricelistID *uint `gorm:"index" json:"competitor_pricelist_id,omitempty"`
|
CompetitorPricelistID *uint `gorm:"index" json:"competitor_pricelist_id,omitempty"`
|
||||||
VendorSpec VendorSpec `gorm:"type:json" json:"vendor_spec,omitempty"`
|
VendorSpec VendorSpec `gorm:"type:json" json:"vendor_spec,omitempty"`
|
||||||
ConfigType string `gorm:"size:20;default:server" json:"config_type"` // "server" | "storage"
|
ConfigType string `gorm:"size:20;default:server" json:"config_type"` // "server" | "storage"
|
||||||
DisablePriceRefresh bool `gorm:"default:false" json:"disable_price_refresh"`
|
DisablePriceRefresh bool `gorm:"default:false" json:"disable_price_refresh"`
|
||||||
OnlyInStock bool `gorm:"default:false" json:"only_in_stock"`
|
|
||||||
RentalItems RentalItemConditions `gorm:"type:json" json:"rental_items,omitempty"`
|
RentalItems RentalItemConditions `gorm:"type:json" json:"rental_items,omitempty"`
|
||||||
RentalUpliftPercent float64 `gorm:"type:decimal(8,2);default:0" json:"rental_uplift_percent"`
|
RentalUpliftPercent float64 `gorm:"type:decimal(8,2);default:0" json:"rental_uplift_percent"`
|
||||||
Line int `gorm:"column:line_no;index" json:"line"`
|
Line int `gorm:"column:line_no;index" json:"line"`
|
||||||
PriceUpdatedAt *time.Time `gorm:"type:timestamp" json:"price_updated_at,omitempty"`
|
PriceUpdatedAt *time.Time `gorm:"type:timestamp" json:"price_updated_at,omitempty"`
|
||||||
CreatedAt time.Time `gorm:"autoCreateTime" json:"created_at"`
|
CreatedAt time.Time `gorm:"autoCreateTime" json:"created_at"`
|
||||||
CurrentVersionNo int `gorm:"-" json:"current_version_no,omitempty"`
|
CurrentVersionNo int `gorm:"-" json:"current_version_no,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (Configuration) TableName() string {
|
func (Configuration) TableName() string {
|
||||||
return "qt_configurations"
|
return "qt_configurations"
|
||||||
}
|
}
|
||||||
|
|
||||||
+14
-12
@@ -3,18 +3,20 @@ package models
|
|||||||
import "time"
|
import "time"
|
||||||
|
|
||||||
type Project struct {
|
type Project struct {
|
||||||
ID uint `gorm:"primaryKey;autoIncrement" json:"id"`
|
ID uint `gorm:"primaryKey;autoIncrement" json:"id"`
|
||||||
UUID string `gorm:"size:36;uniqueIndex;not null" json:"uuid"`
|
UUID string `gorm:"size:36;uniqueIndex;not null" json:"uuid"`
|
||||||
OwnerUsername string `gorm:"size:100;not null;index" json:"owner_username"`
|
OwnerUsername string `gorm:"size:100;not null;index" json:"owner_username"`
|
||||||
Code string `gorm:"size:100;not null;index:idx_qt_projects_code_variant,priority:1" json:"code"`
|
Code string `gorm:"size:100;not null;index:idx_qt_projects_code_variant,priority:1" json:"code"`
|
||||||
Variant string `gorm:"size:100;not null;default:'';index:idx_qt_projects_code_variant,priority:2" json:"variant"`
|
Variant string `gorm:"size:100;not null;default:'';index:idx_qt_projects_code_variant,priority:2" json:"variant"`
|
||||||
Name *string `gorm:"size:200" json:"name,omitempty"`
|
Name *string `gorm:"size:200" json:"name,omitempty"`
|
||||||
TrackerURL string `gorm:"size:500" json:"tracker_url"`
|
TrackerURL string `gorm:"size:500" json:"tracker_url"`
|
||||||
IsActive bool `gorm:"default:true;index" json:"is_active"`
|
IsActive bool `gorm:"default:true;index" json:"is_active"`
|
||||||
IsSystem bool `gorm:"default:false;index" json:"is_system"`
|
IsSystem bool `gorm:"default:false;index" json:"is_system"`
|
||||||
RentalEnabled bool `gorm:"default:false" json:"rental_enabled"`
|
RentalEnabled bool `gorm:"default:false" json:"rental_enabled"`
|
||||||
CreatedAt time.Time `gorm:"autoCreateTime" json:"created_at"`
|
ShowStockPrices bool `gorm:"default:false" json:"show_stock_prices"`
|
||||||
UpdatedAt time.Time `gorm:"autoUpdateTime" json:"updated_at"`
|
OnlyInStock bool `gorm:"default:false" json:"only_in_stock"`
|
||||||
|
CreatedAt time.Time `gorm:"autoCreateTime" json:"created_at"`
|
||||||
|
UpdatedAt time.Time `gorm:"autoUpdateTime" json:"updated_at"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (Project) TableName() string {
|
func (Project) TableName() string {
|
||||||
|
|||||||
@@ -39,6 +39,8 @@ func (r *ProjectRepository) UpsertByUUID(project *models.Project) error {
|
|||||||
"is_active",
|
"is_active",
|
||||||
"is_system",
|
"is_system",
|
||||||
"rental_enabled",
|
"rental_enabled",
|
||||||
|
"show_stock_prices",
|
||||||
|
"only_in_stock",
|
||||||
"updated_at",
|
"updated_at",
|
||||||
}),
|
}),
|
||||||
}).Create(project).Error; err != nil {
|
}).Create(project).Error; err != nil {
|
||||||
|
|||||||
@@ -34,12 +34,13 @@ type CreateConfigRequest struct {
|
|||||||
CompetitorPricelistID *uint `json:"competitor_pricelist_id,omitempty"`
|
CompetitorPricelistID *uint `json:"competitor_pricelist_id,omitempty"`
|
||||||
ConfigType string `json:"config_type,omitempty"` // "server" | "storage"
|
ConfigType string `json:"config_type,omitempty"` // "server" | "storage"
|
||||||
DisablePriceRefresh bool `json:"disable_price_refresh"`
|
DisablePriceRefresh bool `json:"disable_price_refresh"`
|
||||||
OnlyInStock bool `json:"only_in_stock"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type ArticlePreviewRequest struct {
|
type ArticlePreviewRequest struct {
|
||||||
Items models.ConfigItems `json:"items"`
|
Items models.ConfigItems `json:"items"`
|
||||||
ServerModel string `json:"server_model"`
|
ServerModel string `json:"server_model"`
|
||||||
SupportCode string `json:"support_code,omitempty"`
|
SupportCode string `json:"support_code,omitempty"`
|
||||||
PricelistID *uint `json:"pricelist_id,omitempty"`
|
// PricelistID is accepted for backward compatibility but ignored: article
|
||||||
|
// categories come from the component universe (world ∪ estimate), not one pricelist.
|
||||||
|
PricelistID *uint `json:"pricelist_id,omitempty"`
|
||||||
}
|
}
|
||||||
+145
-25
@@ -3,6 +3,7 @@ package services
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"encoding/csv"
|
"encoding/csv"
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"math"
|
"math"
|
||||||
@@ -58,16 +59,56 @@ type ProjectPricingExportOptions struct {
|
|||||||
IncludeEstimate bool `json:"include_estimate"`
|
IncludeEstimate bool `json:"include_estimate"`
|
||||||
IncludeStock bool `json:"include_stock"`
|
IncludeStock bool `json:"include_stock"`
|
||||||
IncludeCompetitor bool `json:"include_competitor"`
|
IncludeCompetitor bool `json:"include_competitor"`
|
||||||
Basis string `json:"basis"` // "fob" or "ddp"; empty defaults to "fob"
|
Basis string `json:"basis"` // "fob" or "ddp"; empty defaults to "fob"
|
||||||
SaleMarkup float64 `json:"sale_markup"` // DDP multiplier; 0 defaults to 1.3
|
SaleMarkup float64 `json:"sale_markup"` // DDP uplift applied to Estimate only; 0 defaults to 1.3
|
||||||
ManualPrice *float64 `json:"manual_price"` // user-defined total price; distributed proportionally across rows
|
ManualPrice *float64 `json:"manual_price"` // user-defined total price; distributed proportionally across rows
|
||||||
|
|
||||||
|
// MinimalSaleColumns/SaleRowMarkups back the Sale table's own per-row "Накидка"
|
||||||
|
// feature (index.html renderPricingTab/_saleRowPrice). Only ever set by
|
||||||
|
// ExportConfigPricingCSV when the request explicitly asks for it — the Buy export
|
||||||
|
// and project-level bulk export never set these, so their output is unaffected.
|
||||||
|
MinimalSaleColumns bool `json:"minimal_sale_columns"`
|
||||||
|
SaleRowMarkups map[string]float64 `json:"sale_row_markups"` // "<vendorPN>::<lot>" -> markup percent
|
||||||
}
|
}
|
||||||
|
|
||||||
func (o ProjectPricingExportOptions) saleMarkupFactor() float64 {
|
// defaultSaleMarkup mirrors PricingMarkup.DEFAULT_SALE_UPLIFT in web/templates/index.html.
|
||||||
|
// Keep both in sync; the frontend always sends an explicit value, this is a fallback for
|
||||||
|
// other API callers that omit sale_markup.
|
||||||
|
const defaultSaleMarkup = 1.3
|
||||||
|
|
||||||
|
// effectiveSaleMarkupFactor resolves the DDP estimate uplift for one configuration.
|
||||||
|
// An explicit opts.SaleMarkup (sent by the single-config pricing tab, which knows the
|
||||||
|
// live-edited value) always wins. Otherwise each configuration's own saved uplift
|
||||||
|
// (persisted in Notes by the "Ценообразование" tab, see index.html buildPricingState/
|
||||||
|
// restorePricingStateFromNotes) is used, so bulk project export matches what exporting
|
||||||
|
// that same configuration individually would produce — one pipeline, not a single
|
||||||
|
// project-wide constant.
|
||||||
|
func (o ProjectPricingExportOptions) effectiveSaleMarkupFactor(cfg *models.Configuration) float64 {
|
||||||
if o.SaleMarkup > 0 {
|
if o.SaleMarkup > 0 {
|
||||||
return o.SaleMarkup
|
return o.SaleMarkup
|
||||||
}
|
}
|
||||||
return 1.3
|
if v := configSavedSaleUplift(cfg); v > 0 {
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
return defaultSaleMarkup
|
||||||
|
}
|
||||||
|
|
||||||
|
// configSavedSaleUplift reads the per-configuration DDP estimate uplift persisted by the
|
||||||
|
// pricing tab. Notes stores {"pricing_ui":{"sale_uplift":...}} as JSON — see
|
||||||
|
// serializeConfigNotes/restorePricingStateFromNotes in index.html.
|
||||||
|
func configSavedSaleUplift(cfg *models.Configuration) float64 {
|
||||||
|
if cfg == nil || strings.TrimSpace(cfg.Notes) == "" {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
var parsed struct {
|
||||||
|
PricingUI struct {
|
||||||
|
SaleUplift float64 `json:"sale_uplift"`
|
||||||
|
} `json:"pricing_ui"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal([]byte(cfg.Notes), &parsed); err != nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
return parsed.PricingUI.SaleUplift
|
||||||
}
|
}
|
||||||
|
|
||||||
func (o ProjectPricingExportOptions) isDDP() bool {
|
func (o ProjectPricingExportOptions) isDDP() bool {
|
||||||
@@ -260,10 +301,14 @@ func (s *ExportService) ToPricingCSV(w io.Writer, data *ProjectPricingExportData
|
|||||||
return fmt.Errorf("failed to write pricing header: %w", err)
|
return fmt.Errorf("failed to write pricing header: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
writeRows := opts.IncludeLOT || opts.IncludeBOM
|
writeRows := opts.IncludeLOT || opts.IncludeBOM || opts.MinimalSaleColumns
|
||||||
for _, cfg := range data.Configs {
|
for _, cfg := range data.Configs {
|
||||||
if err := csvWriter.Write(pricingConfigSummaryRow(cfg, opts)); err != nil {
|
// Minimal mode (single-config Sale export) skips the per-config summary line —
|
||||||
return fmt.Errorf("failed to write config summary row: %w", err)
|
// it's just LOT/Описание/Кол-во/Цена item rows, see pricingCSVHeaders.
|
||||||
|
if !opts.MinimalSaleColumns {
|
||||||
|
if err := csvWriter.Write(pricingConfigSummaryRow(cfg, opts)); err != nil {
|
||||||
|
return fmt.Errorf("failed to write config summary row: %w", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if writeRows {
|
if writeRows {
|
||||||
for _, row := range cfg.Rows {
|
for _, row := range cfg.Rows {
|
||||||
@@ -451,12 +496,7 @@ func (s *ExportService) buildPricingExportBlock(cfg *models.Configuration, opts
|
|||||||
CompetitorWorld: priceMap[lot].CompetitorWorld,
|
CompetitorWorld: priceMap[lot].CompetitorWorld,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if opts.isDDP() {
|
applySalePricing(block.Rows, cfg, opts)
|
||||||
applyDDPMarkup(block.Rows, opts.saleMarkupFactor())
|
|
||||||
}
|
|
||||||
if opts.ManualPrice != nil && *opts.ManualPrice > 0 {
|
|
||||||
distributeManualPrice(block.Rows, *opts.ManualPrice)
|
|
||||||
}
|
|
||||||
return block, nil
|
return block, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -488,16 +528,29 @@ func (s *ExportService) buildPricingExportBlock(cfg *models.Configuration, opts
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
if opts.isDDP() {
|
applySalePricing(block.Rows, cfg, opts)
|
||||||
applyDDPMarkup(block.Rows, opts.saleMarkupFactor())
|
|
||||||
}
|
|
||||||
if opts.ManualPrice != nil && *opts.ManualPrice > 0 {
|
|
||||||
distributeManualPrice(block.Rows, *opts.ManualPrice)
|
|
||||||
}
|
|
||||||
|
|
||||||
return block, nil
|
return block, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// applySalePricing applies the DDP estimate uplift/manual-price/markup pipeline to a
|
||||||
|
// pricing export block. MinimalSaleColumns (only ever set by the single-config Sale
|
||||||
|
// export button) switches to applySaleRowPricing, which additionally folds in each
|
||||||
|
// row's own "Накидка" percent; every other caller (Buy export, project bulk export)
|
||||||
|
// keeps the original applyDDPMarkup + distributeManualPrice behavior unchanged.
|
||||||
|
func applySalePricing(rows []ProjectPricingExportRow, cfg *models.Configuration, opts ProjectPricingExportOptions) {
|
||||||
|
if opts.MinimalSaleColumns {
|
||||||
|
applySaleRowPricing(rows, opts.effectiveSaleMarkupFactor(cfg), opts.ManualPrice, opts.SaleRowMarkups)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if opts.isDDP() {
|
||||||
|
applyDDPMarkup(rows, opts.effectiveSaleMarkupFactor(cfg))
|
||||||
|
}
|
||||||
|
if opts.ManualPrice != nil && *opts.ManualPrice > 0 {
|
||||||
|
distributeManualPrice(rows, *opts.ManualPrice)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// sortConfigItemsByCategoryMap returns a copy of items sorted by category display order.
|
// sortConfigItemsByCategoryMap returns a copy of items sorted by category display order.
|
||||||
// categories maps lot_name → category code; catOrder maps category code → display order.
|
// categories maps lot_name → category code; catOrder maps category code → display order.
|
||||||
func sortConfigItemsByCategoryMap(items models.ConfigItems, catOrder map[string]int, categories map[string]string) models.ConfigItems {
|
func sortConfigItemsByCategoryMap(items models.ConfigItems, catOrder map[string]int, categories map[string]string) models.ConfigItems {
|
||||||
@@ -514,11 +567,68 @@ func sortConfigItemsByCategoryMap(items models.ConfigItems, catOrder map[string]
|
|||||||
return sorted
|
return sorted
|
||||||
}
|
}
|
||||||
|
|
||||||
func applyDDPMarkup(rows []ProjectPricingExportRow, factor float64) {
|
// stockCompetitorMarkupFactor is the fixed DDP multiplier applied to Stock and
|
||||||
|
// Competitor columns, independent of the user-configurable estimate uplift.
|
||||||
|
// Only used by the non-minimal (full-column) DDP export path — the Sale table itself
|
||||||
|
// no longer displays/exports Stock/Competitor, see applySaleRowPricing.
|
||||||
|
const stockCompetitorMarkupFactor = 1.3
|
||||||
|
|
||||||
|
func applyDDPMarkup(rows []ProjectPricingExportRow, estimateFactor float64) {
|
||||||
for i := range rows {
|
for i := range rows {
|
||||||
rows[i].Estimate = scaleFloatPtr(rows[i].Estimate, factor)
|
rows[i].Estimate = scaleFloatPtr(rows[i].Estimate, estimateFactor)
|
||||||
rows[i].Stock = scaleFloatPtr(rows[i].Stock, factor)
|
rows[i].Stock = scaleFloatPtr(rows[i].Stock, stockCompetitorMarkupFactor)
|
||||||
rows[i].Competitor = scaleFloatPtr(rows[i].Competitor, factor)
|
rows[i].Competitor = scaleFloatPtr(rows[i].Competitor, stockCompetitorMarkupFactor)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// saleRowKey mirrors _saleRowKey in web/templates/index.html: a LOT can appear more
|
||||||
|
// than once across different vendor-PN BOM groups, so lot_name alone isn't a safe key.
|
||||||
|
// "—" is the row-builder's own placeholder for "no vendor PN" (see the VendorPN: "—"
|
||||||
|
// literals in buildPricingExportBlock), matching the frontend's empty-string case.
|
||||||
|
func saleRowKey(vendorPN, lot string) string {
|
||||||
|
v := strings.ToUpper(strings.TrimSpace(vendorPN))
|
||||||
|
if v == "" || v == "—" {
|
||||||
|
v = "NONE"
|
||||||
|
}
|
||||||
|
return v + "::" + strings.ToUpper(strings.TrimSpace(lot))
|
||||||
|
}
|
||||||
|
|
||||||
|
// applySaleRowPricing implements the per-row "Накидка" pricing pipeline for the
|
||||||
|
// minimal Sale CSV export: each row's base (its raw Estimate, or a proportional share
|
||||||
|
// of manualPrice when set — same last-row-absorbs-remainder distribution as
|
||||||
|
// distributeManualPrice, but overwriting the base instead of a side field) is
|
||||||
|
// multiplied by (saleUplift + that row's own markup percent / 100). Mirrors
|
||||||
|
// _saleRowPrice/recomputeSalePrices in web/templates/index.html exactly.
|
||||||
|
func applySaleRowPricing(rows []ProjectPricingExportRow, saleUplift float64, manualPrice *float64, rowMarkups map[string]float64) {
|
||||||
|
rawTotal := 0.0
|
||||||
|
lastPricedIdx := -1
|
||||||
|
for i, row := range rows {
|
||||||
|
if row.Estimate != nil && *row.Estimate > 0 {
|
||||||
|
rawTotal += *row.Estimate
|
||||||
|
lastPricedIdx = i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
useManual := manualPrice != nil && *manualPrice > 0 && rawTotal > 0
|
||||||
|
|
||||||
|
assigned := 0.0
|
||||||
|
for i := range rows {
|
||||||
|
if rows[i].Estimate == nil || *rows[i].Estimate <= 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
base := *rows[i].Estimate
|
||||||
|
if useManual {
|
||||||
|
if i == lastPricedIdx {
|
||||||
|
base = math.Round((*manualPrice-assigned)*100) / 100
|
||||||
|
} else {
|
||||||
|
share := (*rows[i].Estimate / rawTotal) * (*manualPrice)
|
||||||
|
base = math.Round(share*100) / 100
|
||||||
|
assigned += base
|
||||||
|
}
|
||||||
|
}
|
||||||
|
key := saleRowKey(rows[i].VendorPN, rows[i].LotDisplay)
|
||||||
|
factor := saleUplift + (rowMarkups[key] / 100)
|
||||||
|
price := math.Round(base*factor*100) / 100
|
||||||
|
rows[i].Estimate = floatPtr(price)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -822,6 +932,9 @@ func estimateOnlyTotal(estimatePrice *float64, fallbackUnitPrice float64, quanti
|
|||||||
}
|
}
|
||||||
|
|
||||||
func pricingCSVHeaders(opts ProjectPricingExportOptions) []string {
|
func pricingCSVHeaders(opts ProjectPricingExportOptions) []string {
|
||||||
|
if opts.MinimalSaleColumns {
|
||||||
|
return []string{"LOT", "Описание", "Кол-во", "Цена"}
|
||||||
|
}
|
||||||
headers := make([]string, 0, 9)
|
headers := make([]string, 0, 9)
|
||||||
headers = append(headers, "Line Item")
|
headers = append(headers, "Line Item")
|
||||||
if opts.IncludeLOT {
|
if opts.IncludeLOT {
|
||||||
@@ -848,6 +961,14 @@ func pricingCSVHeaders(opts ProjectPricingExportOptions) []string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func pricingCSVRow(row ProjectPricingExportRow, opts ProjectPricingExportOptions) []string {
|
func pricingCSVRow(row ProjectPricingExportRow, opts ProjectPricingExportOptions) []string {
|
||||||
|
if opts.MinimalSaleColumns {
|
||||||
|
return []string{
|
||||||
|
emptyDash(row.LotDisplay),
|
||||||
|
emptyDash(row.Description),
|
||||||
|
fmt.Sprintf("%d", exportPositiveInt(row.Quantity, 1)),
|
||||||
|
formatMoneyValue(row.Estimate),
|
||||||
|
}
|
||||||
|
}
|
||||||
record := make([]string, 0, 9)
|
record := make([]string, 0, 9)
|
||||||
record = append(record, "")
|
record = append(record, "")
|
||||||
if opts.IncludeLOT {
|
if opts.IncludeLOT {
|
||||||
@@ -921,7 +1042,6 @@ func pricingConfigSummaryRow(cfg ProjectPricingExportConfig, opts ProjectPricing
|
|||||||
return record
|
return record
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
func formatMoneyValue(value *float64) string {
|
func formatMoneyValue(value *float64) string {
|
||||||
if value == nil {
|
if value == nil {
|
||||||
return "—"
|
return "—"
|
||||||
|
|||||||
@@ -70,13 +70,18 @@ func (s *LocalConfigurationService) Create(ownerUsername string, req *CreateConf
|
|||||||
|
|
||||||
if strings.TrimSpace(req.ServerModel) != "" {
|
if strings.TrimSpace(req.ServerModel) != "" {
|
||||||
articleResult, articleErr := article.Build(s.localDB, req.Items, article.BuildOptions{
|
articleResult, articleErr := article.Build(s.localDB, req.Items, article.BuildOptions{
|
||||||
ServerModel: req.ServerModel,
|
ServerModel: req.ServerModel,
|
||||||
ServerPricelist: pricelistID,
|
|
||||||
})
|
})
|
||||||
if articleErr != nil {
|
if articleErr != nil {
|
||||||
return nil, articleErr
|
return nil, articleErr
|
||||||
}
|
}
|
||||||
req.Article = articleResult.Article
|
req.Article = articleResult.Article
|
||||||
|
if len(articleResult.Warnings) > 0 {
|
||||||
|
slog.Warn("article generation degraded",
|
||||||
|
"server_model", req.ServerModel,
|
||||||
|
"article", articleResult.Article,
|
||||||
|
"warnings", articleResult.Warnings)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
total := req.Items.Total()
|
total := req.Items.Total()
|
||||||
@@ -103,7 +108,6 @@ func (s *LocalConfigurationService) Create(ownerUsername string, req *CreateConf
|
|||||||
CompetitorPricelistID: req.CompetitorPricelistID,
|
CompetitorPricelistID: req.CompetitorPricelistID,
|
||||||
ConfigType: req.ConfigType,
|
ConfigType: req.ConfigType,
|
||||||
DisablePriceRefresh: req.DisablePriceRefresh,
|
DisablePriceRefresh: req.DisablePriceRefresh,
|
||||||
OnlyInStock: req.OnlyInStock,
|
|
||||||
CreatedAt: time.Now(),
|
CreatedAt: time.Now(),
|
||||||
}
|
}
|
||||||
if cfg.ConfigType == "" {
|
if cfg.ConfigType == "" {
|
||||||
@@ -167,13 +171,18 @@ func (s *LocalConfigurationService) Update(uuid string, ownerUsername string, re
|
|||||||
|
|
||||||
if strings.TrimSpace(req.ServerModel) != "" {
|
if strings.TrimSpace(req.ServerModel) != "" {
|
||||||
articleResult, articleErr := article.Build(s.localDB, req.Items, article.BuildOptions{
|
articleResult, articleErr := article.Build(s.localDB, req.Items, article.BuildOptions{
|
||||||
ServerModel: req.ServerModel,
|
ServerModel: req.ServerModel,
|
||||||
ServerPricelist: pricelistID,
|
|
||||||
})
|
})
|
||||||
if articleErr != nil {
|
if articleErr != nil {
|
||||||
return nil, articleErr
|
return nil, articleErr
|
||||||
}
|
}
|
||||||
req.Article = articleResult.Article
|
req.Article = articleResult.Article
|
||||||
|
if len(articleResult.Warnings) > 0 {
|
||||||
|
slog.Warn("article generation degraded",
|
||||||
|
"server_model", req.ServerModel,
|
||||||
|
"article", articleResult.Article,
|
||||||
|
"warnings", articleResult.Warnings)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
total := req.Items.Total()
|
total := req.Items.Total()
|
||||||
@@ -204,7 +213,6 @@ func (s *LocalConfigurationService) Update(uuid string, ownerUsername string, re
|
|||||||
localCfg.WarehousePricelistID = req.WarehousePricelistID
|
localCfg.WarehousePricelistID = req.WarehousePricelistID
|
||||||
localCfg.CompetitorPricelistID = req.CompetitorPricelistID
|
localCfg.CompetitorPricelistID = req.CompetitorPricelistID
|
||||||
localCfg.DisablePriceRefresh = req.DisablePriceRefresh
|
localCfg.DisablePriceRefresh = req.DisablePriceRefresh
|
||||||
localCfg.OnlyInStock = req.OnlyInStock
|
|
||||||
localCfg.UpdatedAt = time.Now()
|
localCfg.UpdatedAt = time.Now()
|
||||||
localCfg.SyncStatus = "pending"
|
localCfg.SyncStatus = "pending"
|
||||||
|
|
||||||
@@ -218,13 +226,10 @@ func (s *LocalConfigurationService) Update(uuid string, ownerUsername string, re
|
|||||||
|
|
||||||
// BuildArticlePreview generates server article based on current items and server_model/support_code.
|
// BuildArticlePreview generates server article based on current items and server_model/support_code.
|
||||||
func (s *LocalConfigurationService) BuildArticlePreview(req *ArticlePreviewRequest) (article.BuildResult, error) {
|
func (s *LocalConfigurationService) BuildArticlePreview(req *ArticlePreviewRequest) (article.BuildResult, error) {
|
||||||
pricelistID, err := s.resolvePricelistID(req.PricelistID)
|
// Categories for the article come from the component universe (world ∪ estimate),
|
||||||
if err != nil {
|
// not from a specific pricelist, so req.PricelistID is no longer needed here.
|
||||||
return article.BuildResult{}, err
|
|
||||||
}
|
|
||||||
return article.Build(s.localDB, req.Items, article.BuildOptions{
|
return article.Build(s.localDB, req.Items, article.BuildOptions{
|
||||||
ServerModel: req.ServerModel,
|
ServerModel: req.ServerModel,
|
||||||
ServerPricelist: pricelistID,
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -328,7 +333,6 @@ func (s *LocalConfigurationService) CloneToProject(configUUID string, ownerUsern
|
|||||||
WarehousePricelistID: original.WarehousePricelistID,
|
WarehousePricelistID: original.WarehousePricelistID,
|
||||||
CompetitorPricelistID: original.CompetitorPricelistID,
|
CompetitorPricelistID: original.CompetitorPricelistID,
|
||||||
DisablePriceRefresh: original.DisablePriceRefresh,
|
DisablePriceRefresh: original.DisablePriceRefresh,
|
||||||
OnlyInStock: original.OnlyInStock,
|
|
||||||
CreatedAt: time.Now(),
|
CreatedAt: time.Now(),
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -530,13 +534,18 @@ func (s *LocalConfigurationService) UpdateNoAuth(uuid string, req *CreateConfigR
|
|||||||
|
|
||||||
if strings.TrimSpace(req.ServerModel) != "" {
|
if strings.TrimSpace(req.ServerModel) != "" {
|
||||||
articleResult, articleErr := article.Build(s.localDB, req.Items, article.BuildOptions{
|
articleResult, articleErr := article.Build(s.localDB, req.Items, article.BuildOptions{
|
||||||
ServerModel: req.ServerModel,
|
ServerModel: req.ServerModel,
|
||||||
ServerPricelist: pricelistID,
|
|
||||||
})
|
})
|
||||||
if articleErr != nil {
|
if articleErr != nil {
|
||||||
return nil, articleErr
|
return nil, articleErr
|
||||||
}
|
}
|
||||||
req.Article = articleResult.Article
|
req.Article = articleResult.Article
|
||||||
|
if len(articleResult.Warnings) > 0 {
|
||||||
|
slog.Warn("article generation degraded",
|
||||||
|
"server_model", req.ServerModel,
|
||||||
|
"article", articleResult.Article,
|
||||||
|
"warnings", articleResult.Warnings)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
total := req.Items.Total()
|
total := req.Items.Total()
|
||||||
@@ -566,7 +575,6 @@ func (s *LocalConfigurationService) UpdateNoAuth(uuid string, req *CreateConfigR
|
|||||||
localCfg.WarehousePricelistID = req.WarehousePricelistID
|
localCfg.WarehousePricelistID = req.WarehousePricelistID
|
||||||
localCfg.CompetitorPricelistID = req.CompetitorPricelistID
|
localCfg.CompetitorPricelistID = req.CompetitorPricelistID
|
||||||
localCfg.DisablePriceRefresh = req.DisablePriceRefresh
|
localCfg.DisablePriceRefresh = req.DisablePriceRefresh
|
||||||
localCfg.OnlyInStock = req.OnlyInStock
|
|
||||||
localCfg.UpdatedAt = time.Now()
|
localCfg.UpdatedAt = time.Now()
|
||||||
localCfg.SyncStatus = "pending"
|
localCfg.SyncStatus = "pending"
|
||||||
|
|
||||||
@@ -685,7 +693,6 @@ func (s *LocalConfigurationService) CloneNoAuthToProjectFromVersion(configUUID s
|
|||||||
WarehousePricelistID: original.WarehousePricelistID,
|
WarehousePricelistID: original.WarehousePricelistID,
|
||||||
CompetitorPricelistID: original.CompetitorPricelistID,
|
CompetitorPricelistID: original.CompetitorPricelistID,
|
||||||
DisablePriceRefresh: original.DisablePriceRefresh,
|
DisablePriceRefresh: original.DisablePriceRefresh,
|
||||||
OnlyInStock: original.OnlyInStock,
|
|
||||||
CreatedAt: time.Now(),
|
CreatedAt: time.Now(),
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1648,7 +1655,6 @@ func (s *LocalConfigurationService) rollbackToVersion(configurationUUID string,
|
|||||||
current.WarehousePricelistID = rollbackData.WarehousePricelistID
|
current.WarehousePricelistID = rollbackData.WarehousePricelistID
|
||||||
current.CompetitorPricelistID = rollbackData.CompetitorPricelistID
|
current.CompetitorPricelistID = rollbackData.CompetitorPricelistID
|
||||||
current.DisablePriceRefresh = rollbackData.DisablePriceRefresh
|
current.DisablePriceRefresh = rollbackData.DisablePriceRefresh
|
||||||
current.OnlyInStock = rollbackData.OnlyInStock
|
|
||||||
current.VendorSpec = rollbackData.VendorSpec
|
current.VendorSpec = rollbackData.VendorSpec
|
||||||
if rollbackData.Line > 0 {
|
if rollbackData.Line > 0 {
|
||||||
current.Line = rollbackData.Line
|
current.Line = rollbackData.Line
|
||||||
|
|||||||
@@ -154,7 +154,6 @@ func TestUpdateNoAuthCreatesRevisionWhenPricingSettingsChanged(t *testing.T) {
|
|||||||
Items: models.ConfigItems{{LotName: "CPU_A", Quantity: 1, UnitPrice: 1000}},
|
Items: models.ConfigItems{{LotName: "CPU_A", Quantity: 1, UnitPrice: 1000}},
|
||||||
ServerCount: 1,
|
ServerCount: 1,
|
||||||
DisablePriceRefresh: true,
|
DisablePriceRefresh: true,
|
||||||
OnlyInStock: true,
|
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
t.Fatalf("update pricing settings: %v", err)
|
t.Fatalf("update pricing settings: %v", err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,19 +17,21 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrProjectNotFound = errors.New("project not found")
|
ErrProjectNotFound = errors.New("project not found")
|
||||||
ErrProjectForbidden = errors.New("access to project forbidden")
|
ErrProjectForbidden = errors.New("access to project forbidden")
|
||||||
ErrProjectCodeExists = errors.New("project code and variant already exist")
|
ErrProjectCodeExists = errors.New("project code and variant already exist")
|
||||||
ErrCannotDeleteMainVariant = errors.New("cannot delete main variant")
|
ErrCannotDeleteMainVariant = errors.New("cannot delete main variant")
|
||||||
ErrReservedMainVariant = errors.New("variant name 'main' is reserved")
|
ErrCannotRenameMainVariant = errors.New("cannot rename main variant")
|
||||||
ErrCannotRenameMainVariant = errors.New("cannot rename main variant")
|
ErrProjectCodeInvalidChars = errors.New("код опти содержит недопустимые символы (разрешены: буквы, цифры, дефис, точка, подчёркивание)")
|
||||||
ErrProjectCodeInvalidChars = errors.New("код опти содержит недопустимые символы (разрешены: буквы, цифры, дефис, точка, подчёркивание)")
|
|
||||||
ErrProjectVariantInvalidChars = errors.New("имя варианта содержит недопустимые символы (разрешены: буквы, цифры, дефис, точка, подчёркивание)")
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// projectCodeRe allows only URL-path-safe characters so project codes can appear directly in URLs.
|
// projectCodeRe allows only URL-path-safe characters so project codes can appear directly in URLs.
|
||||||
var projectCodeRe = regexp.MustCompile(`^[A-Za-z0-9._-]+$`)
|
var projectCodeRe = regexp.MustCompile(`^[A-Za-z0-9._-]+$`)
|
||||||
|
|
||||||
|
// invalidVariantCharsRe matches runs of characters not allowed in a variant name, so they
|
||||||
|
// can be collapsed to a single separator by sanitizeProjectVariantName.
|
||||||
|
var invalidVariantCharsRe = regexp.MustCompile(`[^A-Za-z0-9._-]+`)
|
||||||
|
|
||||||
type ProjectService struct {
|
type ProjectService struct {
|
||||||
localDB *localdb.LocalDB
|
localDB *localdb.LocalDB
|
||||||
}
|
}
|
||||||
@@ -46,11 +48,13 @@ type CreateProjectRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type UpdateProjectRequest struct {
|
type UpdateProjectRequest struct {
|
||||||
Code *string `json:"code,omitempty"`
|
Code *string `json:"code,omitempty"`
|
||||||
Variant *string `json:"variant,omitempty"`
|
Variant *string `json:"variant,omitempty"`
|
||||||
Name *string `json:"name,omitempty"`
|
Name *string `json:"name,omitempty"`
|
||||||
TrackerURL *string `json:"tracker_url,omitempty"`
|
TrackerURL *string `json:"tracker_url,omitempty"`
|
||||||
RentalEnabled *bool `json:"rental_enabled,omitempty"`
|
RentalEnabled *bool `json:"rental_enabled,omitempty"`
|
||||||
|
ShowStockPrices *bool `json:"show_stock_prices,omitempty"`
|
||||||
|
OnlyInStock *bool `json:"only_in_stock,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProjectConfigurationsResult struct {
|
type ProjectConfigurationsResult struct {
|
||||||
@@ -59,7 +63,10 @@ type ProjectConfigurationsResult struct {
|
|||||||
Total float64 `json:"total"`
|
Total float64 `json:"total"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *ProjectService) Create(ownerUsername string, req *CreateProjectRequest) (*models.Project, error) {
|
// Create creates a project. If req.Variant is not a valid variant name (reserved word
|
||||||
|
// "main" or disallowed characters) it is auto-converted into a valid one instead of
|
||||||
|
// rejecting the request; the returned warning is non-empty when that happened.
|
||||||
|
func (s *ProjectService) Create(ownerUsername string, req *CreateProjectRequest) (*models.Project, string, error) {
|
||||||
var namePtr *string
|
var namePtr *string
|
||||||
if req.Name != nil {
|
if req.Name != nil {
|
||||||
name := strings.TrimSpace(*req.Name)
|
name := strings.TrimSpace(*req.Name)
|
||||||
@@ -69,17 +76,14 @@ func (s *ProjectService) Create(ownerUsername string, req *CreateProjectRequest)
|
|||||||
}
|
}
|
||||||
code := strings.TrimSpace(req.Code)
|
code := strings.TrimSpace(req.Code)
|
||||||
if code == "" {
|
if code == "" {
|
||||||
return nil, fmt.Errorf("project code is required")
|
return nil, "", fmt.Errorf("project code is required")
|
||||||
}
|
}
|
||||||
if !projectCodeRe.MatchString(code) {
|
if !projectCodeRe.MatchString(code) {
|
||||||
return nil, ErrProjectCodeInvalidChars
|
return nil, "", ErrProjectCodeInvalidChars
|
||||||
}
|
|
||||||
variant := strings.TrimSpace(req.Variant)
|
|
||||||
if err := validateProjectVariantName(variant); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
}
|
||||||
|
variant, variantWarning := sanitizeProjectVariantName(strings.TrimSpace(req.Variant))
|
||||||
if err := s.ensureUniqueProjectCodeVariant("", code, variant); err != nil {
|
if err := s.ensureUniqueProjectCodeVariant("", code, variant); err != nil {
|
||||||
return nil, err
|
return nil, "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
@@ -97,43 +101,44 @@ func (s *ProjectService) Create(ownerUsername string, req *CreateProjectRequest)
|
|||||||
SyncStatus: "pending",
|
SyncStatus: "pending",
|
||||||
}
|
}
|
||||||
if err := s.localDB.SaveProject(localProject); err != nil {
|
if err := s.localDB.SaveProject(localProject); err != nil {
|
||||||
return nil, err
|
return nil, "", err
|
||||||
}
|
}
|
||||||
if err := s.enqueueProjectPendingChange(localProject, "create"); err != nil {
|
if err := s.enqueueProjectPendingChange(localProject, "create"); err != nil {
|
||||||
return nil, err
|
return nil, "", err
|
||||||
}
|
}
|
||||||
return localdb.LocalToProject(localProject), nil
|
return localdb.LocalToProject(localProject), variantWarning, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *ProjectService) Update(projectUUID, ownerUsername string, req *UpdateProjectRequest) (*models.Project, error) {
|
// Update updates a project. Like Create, an invalid req.Variant (reserved word "main" or
|
||||||
|
// disallowed characters) is auto-converted into a valid one instead of rejecting the
|
||||||
|
// request; the returned warning is non-empty when that happened.
|
||||||
|
func (s *ProjectService) Update(projectUUID, ownerUsername string, req *UpdateProjectRequest) (*models.Project, string, error) {
|
||||||
localProject, err := s.localDB.GetProjectByUUID(projectUUID)
|
localProject, err := s.localDB.GetProjectByUUID(projectUUID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, ErrProjectNotFound
|
return nil, "", ErrProjectNotFound
|
||||||
}
|
}
|
||||||
|
|
||||||
if req.Code != nil {
|
if req.Code != nil {
|
||||||
code := strings.TrimSpace(*req.Code)
|
code := strings.TrimSpace(*req.Code)
|
||||||
if code == "" {
|
if code == "" {
|
||||||
return nil, fmt.Errorf("project code is required")
|
return nil, "", fmt.Errorf("project code is required")
|
||||||
}
|
}
|
||||||
if !projectCodeRe.MatchString(code) {
|
if !projectCodeRe.MatchString(code) {
|
||||||
return nil, ErrProjectCodeInvalidChars
|
return nil, "", ErrProjectCodeInvalidChars
|
||||||
}
|
}
|
||||||
localProject.Code = code
|
localProject.Code = code
|
||||||
}
|
}
|
||||||
|
var variantWarning string
|
||||||
if req.Variant != nil {
|
if req.Variant != nil {
|
||||||
newVariant := strings.TrimSpace(*req.Variant)
|
newVariant := strings.TrimSpace(*req.Variant)
|
||||||
// Block renaming of the main variant (empty Variant) — there must always be a main.
|
// Block renaming of the main variant (empty Variant) — there must always be a main.
|
||||||
if strings.TrimSpace(localProject.Variant) == "" && newVariant != "" {
|
if strings.TrimSpace(localProject.Variant) == "" && newVariant != "" {
|
||||||
return nil, ErrCannotRenameMainVariant
|
return nil, "", ErrCannotRenameMainVariant
|
||||||
}
|
|
||||||
localProject.Variant = newVariant
|
|
||||||
if err := validateProjectVariantName(localProject.Variant); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
}
|
||||||
|
localProject.Variant, variantWarning = sanitizeProjectVariantName(newVariant)
|
||||||
}
|
}
|
||||||
if err := s.ensureUniqueProjectCodeVariant(projectUUID, localProject.Code, localProject.Variant); err != nil {
|
if err := s.ensureUniqueProjectCodeVariant(projectUUID, localProject.Code, localProject.Variant); err != nil {
|
||||||
return nil, err
|
return nil, "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
if req.Name != nil {
|
if req.Name != nil {
|
||||||
@@ -152,15 +157,21 @@ func (s *ProjectService) Update(projectUUID, ownerUsername string, req *UpdatePr
|
|||||||
if req.RentalEnabled != nil {
|
if req.RentalEnabled != nil {
|
||||||
localProject.RentalEnabled = *req.RentalEnabled
|
localProject.RentalEnabled = *req.RentalEnabled
|
||||||
}
|
}
|
||||||
|
if req.ShowStockPrices != nil {
|
||||||
|
localProject.ShowStockPrices = *req.ShowStockPrices
|
||||||
|
}
|
||||||
|
if req.OnlyInStock != nil {
|
||||||
|
localProject.OnlyInStock = *req.OnlyInStock
|
||||||
|
}
|
||||||
localProject.UpdatedAt = time.Now()
|
localProject.UpdatedAt = time.Now()
|
||||||
localProject.SyncStatus = "pending"
|
localProject.SyncStatus = "pending"
|
||||||
if err := s.localDB.SaveProject(localProject); err != nil {
|
if err := s.localDB.SaveProject(localProject); err != nil {
|
||||||
return nil, err
|
return nil, "", err
|
||||||
}
|
}
|
||||||
if err := s.enqueueProjectPendingChange(localProject, "update"); err != nil {
|
if err := s.enqueueProjectPendingChange(localProject, "update"); err != nil {
|
||||||
return nil, err
|
return nil, "", err
|
||||||
}
|
}
|
||||||
return localdb.LocalToProject(localProject), nil
|
return localdb.LocalToProject(localProject), variantWarning, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *ProjectService) ensureUniqueProjectCodeVariant(excludeUUID, code, variant string) error {
|
func (s *ProjectService) ensureUniqueProjectCodeVariant(excludeUUID, code, variant string) error {
|
||||||
@@ -195,14 +206,31 @@ func normalizeProjectVariant(variant string) string {
|
|||||||
return strings.ToLower(strings.TrimSpace(variant))
|
return strings.ToLower(strings.TrimSpace(variant))
|
||||||
}
|
}
|
||||||
|
|
||||||
func validateProjectVariantName(variant string) error {
|
// sanitizeProjectVariantName converts an invalid variant name (the reserved word "main",
|
||||||
if normalizeProjectVariant(variant) == "main" {
|
// or a name containing characters outside [A-Za-z0-9._-]) into a valid one, returning a
|
||||||
return ErrReservedMainVariant
|
// warning describing the change. Empty input (the implicit main variant) always passes
|
||||||
|
// through unchanged with no warning. Invalid characters are collapsed to a single "-";
|
||||||
|
// if that empties the name, or the result collides with the reserved "main", a "-variant"
|
||||||
|
// suffix is appended to guarantee a valid, non-reserved result.
|
||||||
|
func sanitizeProjectVariantName(variant string) (sanitized string, warning string) {
|
||||||
|
original := strings.TrimSpace(variant)
|
||||||
|
if original == "" {
|
||||||
|
return "", ""
|
||||||
}
|
}
|
||||||
if variant != "" && !projectCodeRe.MatchString(variant) {
|
sanitized = original
|
||||||
return ErrProjectVariantInvalidChars
|
if !projectCodeRe.MatchString(sanitized) {
|
||||||
|
sanitized = strings.Trim(invalidVariantCharsRe.ReplaceAllString(sanitized, "-"), "-")
|
||||||
}
|
}
|
||||||
return nil
|
if sanitized == "" {
|
||||||
|
sanitized = "variant"
|
||||||
|
}
|
||||||
|
if normalizeProjectVariant(sanitized) == "main" {
|
||||||
|
sanitized += "-variant"
|
||||||
|
}
|
||||||
|
if sanitized == original {
|
||||||
|
return sanitized, ""
|
||||||
|
}
|
||||||
|
return sanitized, fmt.Sprintf("имя варианта %q недопустимо — использовано %q", original, sanitized)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *ProjectService) Archive(projectUUID, ownerUsername string) error {
|
func (s *ProjectService) Archive(projectUUID, ownerUsername string) error {
|
||||||
|
|||||||
@@ -1,37 +1,47 @@
|
|||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/localdb"
|
"git.mchus.pro/mchus/quoteforge/internal/localdb"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestProjectServiceCreateRejectsReservedMainVariant(t *testing.T) {
|
// TestProjectServiceCreateSanitizesReservedMainVariant verifies that naming a new
|
||||||
|
// variant "main" no longer errors: the name is auto-converted to a valid one and a
|
||||||
|
// warning is returned instead of the request being rejected.
|
||||||
|
func TestProjectServiceCreateSanitizesReservedMainVariant(t *testing.T) {
|
||||||
local, err := newProjectTestLocalDB(t)
|
local, err := newProjectTestLocalDB(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("open localdb: %v", err)
|
t.Fatalf("open localdb: %v", err)
|
||||||
}
|
}
|
||||||
service := NewProjectService(local)
|
service := NewProjectService(local)
|
||||||
|
|
||||||
_, err = service.Create("tester", &CreateProjectRequest{
|
project, warning, err := service.Create("tester", &CreateProjectRequest{
|
||||||
Code: "OPS-1",
|
Code: "OPS-1",
|
||||||
Variant: "main",
|
Variant: "main",
|
||||||
})
|
})
|
||||||
if !errors.Is(err, ErrReservedMainVariant) {
|
if err != nil {
|
||||||
t.Fatalf("expected ErrReservedMainVariant, got %v", err)
|
t.Fatalf("create project: %v", err)
|
||||||
|
}
|
||||||
|
if warning == "" {
|
||||||
|
t.Fatalf("expected a warning about the reserved variant name")
|
||||||
|
}
|
||||||
|
if project.Variant == "" || normalizeProjectVariant(project.Variant) == "main" {
|
||||||
|
t.Fatalf("expected variant to be converted away from 'main', got %q", project.Variant)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestProjectServiceUpdateRejectsReservedMainVariant(t *testing.T) {
|
// TestProjectServiceUpdateSanitizesReservedMainVariant mirrors the create case for
|
||||||
|
// renaming an existing (non-main) variant to "main".
|
||||||
|
func TestProjectServiceUpdateSanitizesReservedMainVariant(t *testing.T) {
|
||||||
local, err := newProjectTestLocalDB(t)
|
local, err := newProjectTestLocalDB(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("open localdb: %v", err)
|
t.Fatalf("open localdb: %v", err)
|
||||||
}
|
}
|
||||||
service := NewProjectService(local)
|
service := NewProjectService(local)
|
||||||
|
|
||||||
created, err := service.Create("tester", &CreateProjectRequest{
|
created, _, err := service.Create("tester", &CreateProjectRequest{
|
||||||
Code: "OPS-1",
|
Code: "OPS-1",
|
||||||
Variant: "Lenovo",
|
Variant: "Lenovo",
|
||||||
})
|
})
|
||||||
@@ -40,11 +50,41 @@ func TestProjectServiceUpdateRejectsReservedMainVariant(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
mainName := "main"
|
mainName := "main"
|
||||||
_, err = service.Update(created.UUID, "tester", &UpdateProjectRequest{
|
updated, warning, err := service.Update(created.UUID, "tester", &UpdateProjectRequest{
|
||||||
Variant: &mainName,
|
Variant: &mainName,
|
||||||
})
|
})
|
||||||
if !errors.Is(err, ErrReservedMainVariant) {
|
if err != nil {
|
||||||
t.Fatalf("expected ErrReservedMainVariant, got %v", err)
|
t.Fatalf("update project: %v", err)
|
||||||
|
}
|
||||||
|
if warning == "" {
|
||||||
|
t.Fatalf("expected a warning about the reserved variant name")
|
||||||
|
}
|
||||||
|
if updated.Variant == "" || normalizeProjectVariant(updated.Variant) == "main" {
|
||||||
|
t.Fatalf("expected variant to be converted away from 'main', got %q", updated.Variant)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSanitizeProjectVariantName_InvalidChars verifies disallowed characters are
|
||||||
|
// stripped/replaced rather than rejected outright.
|
||||||
|
func TestSanitizeProjectVariantName_InvalidChars(t *testing.T) {
|
||||||
|
sanitized, warning := sanitizeProjectVariantName("Лендинг сервер!")
|
||||||
|
if warning == "" {
|
||||||
|
t.Fatalf("expected a warning for invalid characters")
|
||||||
|
}
|
||||||
|
if !projectCodeRe.MatchString(sanitized) {
|
||||||
|
t.Fatalf("sanitized variant %q still fails projectCodeRe", sanitized)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSanitizeProjectVariantName_ValidPassesThrough ensures already-valid names are
|
||||||
|
// left untouched with no warning.
|
||||||
|
func TestSanitizeProjectVariantName_ValidPassesThrough(t *testing.T) {
|
||||||
|
sanitized, warning := sanitizeProjectVariantName("lenovo-2u")
|
||||||
|
if warning != "" {
|
||||||
|
t.Fatalf("expected no warning, got %q", warning)
|
||||||
|
}
|
||||||
|
if sanitized != "lenovo-2u" {
|
||||||
|
t.Fatalf("expected unchanged variant, got %q", sanitized)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -218,6 +218,8 @@ func (s *Service) ImportProjectsToLocal() (*ProjectImportResult, error) {
|
|||||||
existing.IsActive = project.IsActive
|
existing.IsActive = project.IsActive
|
||||||
existing.IsSystem = project.IsSystem
|
existing.IsSystem = project.IsSystem
|
||||||
existing.RentalEnabled = project.RentalEnabled
|
existing.RentalEnabled = project.RentalEnabled
|
||||||
|
existing.ShowStockPrices = project.ShowStockPrices
|
||||||
|
existing.OnlyInStock = project.OnlyInStock
|
||||||
existing.CreatedAt = project.CreatedAt
|
existing.CreatedAt = project.CreatedAt
|
||||||
existing.UpdatedAt = project.UpdatedAt
|
existing.UpdatedAt = project.UpdatedAt
|
||||||
serverID := project.ID
|
serverID := project.ID
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ func TestPushPendingChangesProjectsBeforeConfigurations(t *testing.T) {
|
|||||||
projectService := services.NewProjectService(local)
|
projectService := services.NewProjectService(local)
|
||||||
configService := services.NewLocalConfigurationService(local, localSync, &services.QuoteService{}, func() bool { return false })
|
configService := services.NewLocalConfigurationService(local, localSync, &services.QuoteService{}, func() bool { return false })
|
||||||
|
|
||||||
project, err := projectService.Create("tester", &services.CreateProjectRequest{Name: ptrString("Project A"), Code: "PRJ-A"})
|
project, _, err := projectService.Create("tester", &services.CreateProjectRequest{Name: ptrString("Project A"), Code: "PRJ-A"})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("create project: %v", err)
|
t.Fatalf("create project: %v", err)
|
||||||
}
|
}
|
||||||
@@ -74,11 +74,11 @@ func TestPushPendingChangesProjectCreateThenUpdateBeforeFirstPush(t *testing.T)
|
|||||||
configService := services.NewLocalConfigurationService(local, localSync, &services.QuoteService{}, func() bool { return false })
|
configService := services.NewLocalConfigurationService(local, localSync, &services.QuoteService{}, func() bool { return false })
|
||||||
pushService := syncsvc.NewServiceWithDB(serverDB, local)
|
pushService := syncsvc.NewServiceWithDB(serverDB, local)
|
||||||
|
|
||||||
project, err := projectService.Create("tester", &services.CreateProjectRequest{Name: ptrString("Project v1"), Code: "PRJ-V1"})
|
project, _, err := projectService.Create("tester", &services.CreateProjectRequest{Name: ptrString("Project v1"), Code: "PRJ-V1"})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("create project: %v", err)
|
t.Fatalf("create project: %v", err)
|
||||||
}
|
}
|
||||||
if _, err := projectService.Update(project.UUID, "tester", &services.UpdateProjectRequest{Name: ptrString("Project v2")}); err != nil {
|
if _, _, err := projectService.Update(project.UUID, "tester", &services.UpdateProjectRequest{Name: ptrString("Project v2")}); err != nil {
|
||||||
t.Fatalf("update project: %v", err)
|
t.Fatalf("update project: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
# QuoteForge v3.34
|
||||||
|
|
||||||
|
Дата релиза: 2026-08-10
|
||||||
|
Тег: `v3.34`
|
||||||
|
|
||||||
|
Предыдущий релиз: `v3.33`
|
||||||
|
|
||||||
|
## Ключевые изменения
|
||||||
|
|
||||||
|
- CSV-экспорт цены продажи (DDP): колонка Estimate игнорировала пользовательский коэффициент «Аплифт к estimate» и всегда экспортировалась с x1,3 — фронтенд не передавал значение поля в бэкенд, а `applyDDPMarkup` применял один и тот же множитель ко всем трём колонкам сразу; теперь Estimate масштабируется по аплифту, Склад/Конкуренты — фиксированным x1,3;
|
||||||
|
- рефакторинг дублирующегося кода без изменения поведения: в Go-хендлерах устранены повторяющиеся switch-конструкции обработки ошибок и bind-логика (`cmd/qfs/main.go`, `internal/handlers`, `internal/appstate`, `internal/article`); во фронтенде сведены в общие функции пять идентичных обработчиков клавиатурной навигации автокомплита и четыре функции сборки нового элемента корзины.
|
||||||
|
|
||||||
|
## Запуск на macOS
|
||||||
|
|
||||||
|
Снимите карантинный атрибут через терминал: `xattr -d com.apple.quarantine /path/to/qfs-darwin-arm64`
|
||||||
|
После этого бинарник запустится без предупреждения Gatekeeper.
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
# QuoteForge v3.35
|
||||||
|
|
||||||
|
Дата релиза: 2026-08-12
|
||||||
|
Тег: `v3.35`
|
||||||
|
|
||||||
|
Предыдущий релиз: `v3.34`
|
||||||
|
|
||||||
|
## Ключевые изменения
|
||||||
|
|
||||||
|
- новый чекбокс «Складские цены» на уровне проекта (по аналогии с «Аренда») — включает/выключает показ складских цен во всех ценовых интерфейсах конфигураций проекта, включая CSV-экспорт; по умолчанию выключен;
|
||||||
|
- чекбокс «Только наличие» перенесён из настроек цен конфигурации в настройки проекта и теперь активен только при включённых «Складские цены»; фильтрация компонентов по наличию работает как раньше.
|
||||||
|
|
||||||
|
## Запуск на macOS
|
||||||
|
|
||||||
|
Снимите карантинный атрибут через терминал: `xattr -d com.apple.quarantine /path/to/qfs-darwin-arm64`
|
||||||
|
После этого бинарник запустится без предупреждения Gatekeeper.
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
# QuoteForge v3.36
|
||||||
|
|
||||||
|
Дата релиза: 2026-08-12
|
||||||
|
Тег: `v3.36`
|
||||||
|
|
||||||
|
Предыдущий релиз: `v3.35`
|
||||||
|
|
||||||
|
## Ключевые изменения
|
||||||
|
|
||||||
|
- исправлен DDP-экспорт CSV со страницы проекта: раньше всегда применялся коэффициент 1,3 ко всем конфигурациям, теперь используется собственный аплифт каждой конфигурации из раздела «Ценообразование» — экспорт с проекта идёт по тому же конвейеру, что и экспорт с конкретной конфигурации;
|
||||||
|
- упрощена подпись DDP в модалке экспорта проекта.
|
||||||
|
|
||||||
|
## Запуск на macOS
|
||||||
|
|
||||||
|
Снимите карантинный атрибут через терминал: `xattr -d com.apple.quarantine /path/to/qfs-darwin-arm64`
|
||||||
|
После этого бинарник запустится без предупреждения Gatekeeper.
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
# QuoteForge v3.37
|
||||||
|
|
||||||
|
Дата релиза: 2026-08-24
|
||||||
|
Тег: `v3.37`
|
||||||
|
|
||||||
|
Предыдущий релиз: `v3.36`
|
||||||
|
|
||||||
|
## Ключевые изменения
|
||||||
|
|
||||||
|
- исправлен баг конфигуратора: при изменении количества в таблицах с несколькими компонентами (диски, RAID-контроллеры и т.п.) поле «Кол-во» затиралось суммой в долларах, а «Стоимость» переставала пересчитываться корректно;
|
||||||
|
- заодно ужесточён поиск строки в таблице при обновлении количества — теперь строго по LOT-коду, без риска задеть соседнюю строку с похожим названием.
|
||||||
|
|
||||||
|
## Запуск на macOS
|
||||||
|
|
||||||
|
Снимите карантинный атрибут через терминал: `xattr -d com.apple.quarantine /path/to/qfs-darwin-arm64`
|
||||||
|
После этого бинарник запустится без предупреждения Gatekeeper.
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
# QuoteForge v3.39
|
||||||
|
|
||||||
|
Дата релиза: 2026-08-31
|
||||||
|
Тег: `v3.39`
|
||||||
|
|
||||||
|
Предыдущий релиз: `v3.37`
|
||||||
|
|
||||||
|
## Ключевые изменения
|
||||||
|
|
||||||
|
- новый режим индикаторов без цветовой кодировки (переключатель на странице «Настройки»): всё, что раньше передавалось только цветом, переходит на форму и текст — качество цены рисуется значком-«сигналом» из 5 столбиков вместо цветной точки/числа, на вкладке «Ценообразование» вместо заливки строк появляется отдельная колонка-индикатор слева, цены-заглушки из прайслиста WORLD помечаются буквой «W», а «загрязнённый» итог — значком «⚠» вместо красного цвета; подходит при нарушениях цветовосприятия, обычный цветовой режим остаётся по умолчанию;
|
||||||
|
- страница «Настройки» переустроена: два блока («Подключение к базе данных» и «Индикаторы») в две колонки одной высоты, добавлена кнопка «Вернуться в приложение», поправлен заголовок вкладки браузера;
|
||||||
|
- версия приложения теперь показывается в шапке рядом с логотипом (убрано дублирование «vv» и хардкод «v1.0» на странице настройки БД);
|
||||||
|
- исправлена ошибка JavaScript из-за повторного объявления функции экранирования HTML.
|
||||||
|
|
||||||
|
## Запуск на macOS
|
||||||
|
|
||||||
|
Снимите карантинный атрибут через терминал: `xattr -d com.apple.quarantine /path/to/qfs-darwin-arm64`
|
||||||
|
После этого бинарник запустится без предупреждения Gatekeeper.
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
# QuoteForge v3.40
|
||||||
|
|
||||||
|
Дата релиза: 2026-09-01
|
||||||
|
Тег: `v3.40`
|
||||||
|
|
||||||
|
Предыдущий релиз: `v3.39`
|
||||||
|
|
||||||
|
## Ключевые изменения
|
||||||
|
|
||||||
|
- артикул: категория LOT для сегмента берётся из component universe (`world ∪ estimate`), а не из привязанного к конфигурации прайслиста — LOT, который есть только в `world` (напр. `GPU_NV_RTX_PRO_6000D_SERVER_84GB_PCIE`), больше не выпадает из артикула;
|
||||||
|
- артикул: нераспознанный токен больше не пишется как `UNK` — в артикул идёт категория LOT (`4xGPU`, `2xCPU`), сегмент помечается как нераспознанный;
|
||||||
|
- конфигуратор подсвечивает нераспознанные части артикула (amber) и выводит список предупреждений с именами LOT; сохранение конфигурации пишет `WARN` в лог;
|
||||||
|
- `POST /api/configs/preview-article` возвращает разбор артикула по сегментам (`segments[]`);
|
||||||
|
- `parseGPUModel` сохраняет буквенный суффикс в номере модели (`6000D` → `RTX6000D`), раньше терял его и схлопывал до `RTX`.
|
||||||
|
|
||||||
|
## Запуск на macOS
|
||||||
|
|
||||||
|
Снимите карантинный атрибут через терминал: `xattr -d com.apple.quarantine /path/to/qfs-darwin-arm64`
|
||||||
|
После этого бинарник запустится без предупреждения Gatekeeper.
|
||||||
@@ -44,3 +44,42 @@
|
|||||||
visibility: visible;
|
visibility: visible;
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Colour-blind-safe price-quality indicator (mono mode). 5-step signal meter,
|
||||||
|
single neutral hue — magnitude reads from the number of lit bars, not colour. */
|
||||||
|
.qf-quality-meter {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: flex-end;
|
||||||
|
gap: 1px;
|
||||||
|
height: 12px;
|
||||||
|
vertical-align: middle;
|
||||||
|
line-height: 0;
|
||||||
|
}
|
||||||
|
.qf-quality-meter > i {
|
||||||
|
display: inline-block;
|
||||||
|
width: 3px;
|
||||||
|
background-color: #d1d5db;
|
||||||
|
border-radius: 1px;
|
||||||
|
}
|
||||||
|
.qf-quality-meter > i.on {
|
||||||
|
background-color: #374151;
|
||||||
|
}
|
||||||
|
.qf-quality-meter > i:nth-child(1) { height: 30%; }
|
||||||
|
.qf-quality-meter > i:nth-child(2) { height: 45%; }
|
||||||
|
.qf-quality-meter > i:nth-child(3) { height: 62%; }
|
||||||
|
.qf-quality-meter > i:nth-child(4) { height: 80%; }
|
||||||
|
.qf-quality-meter > i:nth-child(5) { height: 100%; }
|
||||||
|
.qf-quality-meter[data-size="sm"] {
|
||||||
|
height: 10px;
|
||||||
|
gap: 1px;
|
||||||
|
}
|
||||||
|
.qf-quality-meter[data-size="sm"] > i {
|
||||||
|
width: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Leading meter column on the pricing tab tables (mono mode). */
|
||||||
|
.pricing-quality-meter {
|
||||||
|
width: 1%;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
@@ -1,16 +1,25 @@
|
|||||||
// Shared LOT price-quality color scale, used everywhere price_quality is
|
// Shared LOT price-quality indicator, used everywhere price_quality is
|
||||||
// displayed (pricelist detail page, configurator search dropdown, configurator
|
// displayed (pricelist detail page, configurator search dropdown, configurator
|
||||||
// table, pricing tab). price_quality is a 0-9 score set by the external
|
// table, pricing tab). price_quality is a 0-9 score set by the external pricing
|
||||||
// pricing tool (see bible-local/03-database.md, qt_pricelist_items.price_quality)
|
// tool (see bible-local/03-database.md, qt_pricelist_items.price_quality) — QF
|
||||||
// — QF only displays it, never computes it. Single source of the color scale
|
// only displays it, never computes it. Single source of the visual scale so
|
||||||
// so every view stays visually consistent.
|
// every view stays consistent.
|
||||||
//
|
//
|
||||||
// Gradient: 0 = red, 5 = yellow, 9 = green.
|
// Two render modes, chosen per client via window.QF_INDICATOR_MODE (injected by
|
||||||
|
// base.html from app_settings, key indicator_mode):
|
||||||
|
// "color" (default) — hue scale, 0 = red, 5 = yellow, 9 = green.
|
||||||
|
// "accessible" — colour-blind-safe 5-step signal-strength meter,
|
||||||
|
// single neutral hue, magnitude encoded by bar count.
|
||||||
|
// See bible-local/decisions/2026-08-31-accessible-indicator-mode.md.
|
||||||
(function () {
|
(function () {
|
||||||
const RED = [220, 38, 38];
|
const RED = [220, 38, 38];
|
||||||
const YELLOW = [234, 179, 8];
|
const YELLOW = [234, 179, 8];
|
||||||
const GREEN = [22, 163, 74];
|
const GREEN = [22, 163, 74];
|
||||||
|
|
||||||
|
function isAccessible() {
|
||||||
|
return window.QF_INDICATOR_MODE === 'accessible';
|
||||||
|
}
|
||||||
|
|
||||||
function lerp(c1, c2, t) {
|
function lerp(c1, c2, t) {
|
||||||
return c1.map((v, i) => Math.round(v + (c2[i] - v) * t));
|
return c1.map((v, i) => Math.round(v + (c2[i] - v) * t));
|
||||||
}
|
}
|
||||||
@@ -28,27 +37,53 @@
|
|||||||
return rgb ? `rgb(${rgb})` : null;
|
return rgb ? `rgb(${rgb})` : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Small colored dot for compact contexts (search dropdown, configurator table cell).
|
// 0-9 score -> 0-4 meter level. 0-1 / 2-3 / 4-5 / 6-7 / 8-9.
|
||||||
|
function priceQualityLevel(quality) {
|
||||||
|
if (typeof quality !== 'number' || Number.isNaN(quality)) return null;
|
||||||
|
const q = Math.max(0, Math.min(9, quality));
|
||||||
|
return Math.min(4, Math.floor(q / 2));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Monochrome 5-step signal-strength meter. size: undefined | 'sm'.
|
||||||
|
function qualityMeterHtml(quality, opts) {
|
||||||
|
const level = priceQualityLevel(quality);
|
||||||
|
if (level === null) return '';
|
||||||
|
const size = opts && opts.size === 'sm' ? ' data-size="sm"' : '';
|
||||||
|
const title = `Качество цены: ${quality}/9`;
|
||||||
|
let bars = '';
|
||||||
|
for (let i = 0; i < 5; i++) {
|
||||||
|
bars += `<i class="${i <= level ? 'on' : ''}"></i>`;
|
||||||
|
}
|
||||||
|
return `<span class="qf-quality-meter"${size} role="img" aria-label="${title}" title="${title}">${bars}</span>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Small indicator for compact contexts (search dropdown, configurator table cell).
|
||||||
function qualityDotHtml(quality) {
|
function qualityDotHtml(quality) {
|
||||||
|
if (isAccessible()) return qualityMeterHtml(quality, { size: 'sm' });
|
||||||
const color = priceQualityColor(quality);
|
const color = priceQualityColor(quality);
|
||||||
if (!color) return '';
|
if (!color) return '';
|
||||||
return `<span class="inline-block w-2 h-2 rounded-full" style="background-color: ${color}" title="Качество цены: ${quality}/9"></span>`;
|
return `<span class="inline-block w-2 h-2 rounded-full" style="background-color: ${color}" title="Качество цены: ${quality}/9"></span>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Colored number badge for a dedicated "quality" column/cell.
|
// Indicator for a dedicated "quality" column/cell.
|
||||||
function qualityBadgeHtml(quality) {
|
function qualityBadgeHtml(quality) {
|
||||||
if (typeof quality !== 'number') return '<span class="text-gray-400">-</span>';
|
if (typeof quality !== 'number') return '<span class="text-gray-400">-</span>';
|
||||||
|
if (isAccessible()) return qualityMeterHtml(quality, { size: 'sm' });
|
||||||
const color = priceQualityColor(quality);
|
const color = priceQualityColor(quality);
|
||||||
return `<span class="font-semibold" style="color: ${color}" title="Качество цены: ${quality}/9">${quality}</span>`;
|
return `<span class="font-semibold" style="color: ${color}" title="Качество цены: ${quality}/9">${quality}</span>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Light row-tint background for table rows, e.g. the pricing tab.
|
// Light row-tint background for table rows, e.g. the pricing tab. Suppressed
|
||||||
|
// in accessible mode — the pricing tab carries its own leading meter column there.
|
||||||
function qualityRowStyle(quality) {
|
function qualityRowStyle(quality) {
|
||||||
|
if (isAccessible()) return '';
|
||||||
const rgb = priceQualityRgb(quality);
|
const rgb = priceQualityRgb(quality);
|
||||||
return rgb ? `background-color: rgba(${rgb}, 0.10)` : '';
|
return rgb ? `background-color: rgba(${rgb}, 0.10)` : '';
|
||||||
}
|
}
|
||||||
|
|
||||||
window.priceQualityColor = priceQualityColor;
|
window.priceQualityColor = priceQualityColor;
|
||||||
|
window.priceQualityLevel = priceQualityLevel;
|
||||||
|
window.qualityMeterHtml = qualityMeterHtml;
|
||||||
window.qualityDotHtml = qualityDotHtml;
|
window.qualityDotHtml = qualityDotHtml;
|
||||||
window.qualityBadgeHtml = qualityBadgeHtml;
|
window.qualityBadgeHtml = qualityBadgeHtml;
|
||||||
window.qualityRowStyle = qualityRowStyle;
|
window.qualityRowStyle = qualityRowStyle;
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
<link rel="stylesheet" href="/static/app.css">
|
<link rel="stylesheet" href="/static/app.css">
|
||||||
<script src="/static/vendor/tailwindcss.browser.js"></script>
|
<script src="/static/vendor/tailwindcss.browser.js"></script>
|
||||||
<script src="/static/vendor/htmx-1.9.10.min.js"></script>
|
<script src="/static/vendor/htmx-1.9.10.min.js"></script>
|
||||||
|
<script>window.QF_INDICATOR_MODE = "{{ .IndicatorMode }}";</script>
|
||||||
<script src="/static/price-quality.js"></script>
|
<script src="/static/price-quality.js"></script>
|
||||||
<style>
|
<style>
|
||||||
.htmx-request { opacity: 0.5; }
|
.htmx-request { opacity: 0.5; }
|
||||||
@@ -19,7 +20,7 @@
|
|||||||
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||||
<div class="flex justify-between h-14">
|
<div class="flex justify-between h-14">
|
||||||
<div class="flex items-center space-x-8">
|
<div class="flex items-center space-x-8">
|
||||||
<a href="/" class="text-xl font-bold text-blue-600">QuoteForge</a>
|
<a href="/" class="text-xl font-bold text-blue-600">QuoteForge<span class="text-xs font-normal text-gray-400 align-middle ml-1">{{.AppVersion}}</span></a>
|
||||||
<div class="hidden md:flex space-x-4">
|
<div class="hidden md:flex space-x-4">
|
||||||
<a href="/projects" class="text-gray-600 hover:text-gray-900 px-3 py-2 text-sm">Мои проекты</a>
|
<a href="/projects" class="text-gray-600 hover:text-gray-900 px-3 py-2 text-sm">Мои проекты</a>
|
||||||
<a href="/pricelists" class="text-gray-600 hover:text-gray-900 px-3 py-2 text-sm">Прайслисты</a>
|
<a href="/pricelists" class="text-gray-600 hover:text-gray-900 px-3 py-2 text-sm">Прайслисты</a>
|
||||||
@@ -55,10 +56,6 @@
|
|||||||
{{template "content" .}}
|
{{template "content" .}}
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<footer class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-3 text-right">
|
|
||||||
<span class="text-xs text-gray-400">v{{.AppVersion}}</span>
|
|
||||||
</footer>
|
|
||||||
|
|
||||||
<div id="toast" class="fixed bottom-4 right-4 z-50"></div>
|
<div id="toast" class="fixed bottom-4 right-4 z-50"></div>
|
||||||
|
|
||||||
<!-- Dead-man's switch overlay: shown when backend process stops responding -->
|
<!-- Dead-man's switch overlay: shown when backend process stops responding -->
|
||||||
|
|||||||
+355
-295
File diff suppressed because it is too large.
Load diff
@@ -178,7 +178,7 @@
|
|||||||
<label class="flex items-center gap-2 text-sm text-gray-700 cursor-pointer">
|
<label class="flex items-center gap-2 text-sm text-gray-700 cursor-pointer">
|
||||||
<input type="radio" name="export-basis" value="ddp" class="border-gray-300">
|
<input type="radio" name="export-basis" value="ddp" class="border-gray-300">
|
||||||
<span class="font-medium">DDP</span>
|
<span class="font-medium">DDP</span>
|
||||||
<span class="text-gray-400">— Цена продажи ×1,3</span>
|
<span class="text-gray-400">— Цена продажи</span>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -321,6 +321,20 @@
|
|||||||
</label>
|
</label>
|
||||||
<div class="text-xs text-gray-500 mt-1">Добавляет вкладку «Аренда» (расчёт стоимости платного тестирования/аренды) на конфигурациях этого проекта.</div>
|
<div class="text-xs text-gray-500 mt-1">Добавляет вкладку «Аренда» (расчёт стоимости платного тестирования/аренды) на конфигурациях этого проекта.</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div>
|
||||||
|
<label class="flex items-center space-x-2">
|
||||||
|
<input type="checkbox" id="project-settings-show-stock-prices" class="rounded border-gray-300" onchange="applyStockSettingsGating()">
|
||||||
|
<span class="text-sm font-medium text-gray-700">Складские цены</span>
|
||||||
|
</label>
|
||||||
|
<div class="text-xs text-gray-500 mt-1">Показывает складские (Stock) цены во всех ценовых интерфейсах конфигураций этого проекта, включая экспорты CSV.</div>
|
||||||
|
</div>
|
||||||
|
<div id="project-settings-only-in-stock-wrap">
|
||||||
|
<label class="flex items-center space-x-2">
|
||||||
|
<input type="checkbox" id="project-settings-only-in-stock" class="rounded border-gray-300">
|
||||||
|
<span class="text-sm font-medium text-gray-700">Только наличие</span>
|
||||||
|
</label>
|
||||||
|
<div class="text-xs text-gray-500 mt-1">При добавлении компонентов предлагает только позиции, доступные на складе. Активно только вместе со «Складские цены».</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex justify-end space-x-3 mt-6">
|
<div class="flex justify-end space-x-3 mt-6">
|
||||||
<button onclick="closeProjectSettingsModal()" class="px-4 py-2 text-gray-600 hover:text-gray-800">Отмена</button>
|
<button onclick="closeProjectSettingsModal()" class="px-4 py-2 text-gray-600 hover:text-gray-800">Отмена</button>
|
||||||
@@ -667,8 +681,8 @@ function closeVariantActionModal() {
|
|||||||
|
|
||||||
function findUniqueVariantActionName(baseName, targetCode, excludeProjectUUID) {
|
function findUniqueVariantActionName(baseName, targetCode, excludeProjectUUID) {
|
||||||
const cleanedBase = (baseName || '').trim();
|
const cleanedBase = (baseName || '').trim();
|
||||||
if (!cleanedBase || normalizeVariantLabel(cleanedBase).toLowerCase() === 'main') {
|
if (!cleanedBase) {
|
||||||
return {error: 'Имя варианта не должно быть пустым и не может быть main'};
|
return {error: 'Имя варианта не должно быть пустым'};
|
||||||
}
|
}
|
||||||
|
|
||||||
const code = (targetCode || '').trim();
|
const code = (targetCode || '').trim();
|
||||||
@@ -791,10 +805,6 @@ async function saveVariantAction() {
|
|||||||
})
|
})
|
||||||
});
|
});
|
||||||
if (!createResp.ok) {
|
if (!createResp.ok) {
|
||||||
if (createResp.status === 400) {
|
|
||||||
notify('Имя варианта не может быть main', 'error');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (createResp.status === 409) {
|
if (createResp.status === 409) {
|
||||||
notify('Вариант с таким кодом и значением уже существует', 'error');
|
notify('Вариант с таким кодом и значением уже существует', 'error');
|
||||||
return;
|
return;
|
||||||
@@ -815,7 +825,7 @@ async function saveVariantAction() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
closeVariantActionModal();
|
closeVariantActionModal();
|
||||||
notify('Копия варианта создана', 'success');
|
notify(created.variant_warning ? 'Копия варианта создана. ' + created.variant_warning : 'Копия варианта создана', 'success');
|
||||||
window.location.href = '/projects/' + created.uuid;
|
window.location.href = '/projects/' + created.uuid;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -832,10 +842,6 @@ async function saveVariantAction() {
|
|||||||
body: JSON.stringify({code: code, variant: name})
|
body: JSON.stringify({code: code, variant: name})
|
||||||
});
|
});
|
||||||
if (!updateResp.ok) {
|
if (!updateResp.ok) {
|
||||||
if (updateResp.status === 400) {
|
|
||||||
notify('Имя варианта не может быть main', 'error');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (updateResp.status === 409) {
|
if (updateResp.status === 409) {
|
||||||
notify('Вариант с таким кодом и значением уже существует', 'error');
|
notify('Вариант с таким кодом и значением уже существует', 'error');
|
||||||
return;
|
return;
|
||||||
@@ -843,12 +849,13 @@ async function saveVariantAction() {
|
|||||||
notify('Не удалось сохранить вариант', 'error');
|
notify('Не удалось сохранить вариант', 'error');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
const updated = await updateResp.json().catch(() => null);
|
||||||
|
|
||||||
closeVariantActionModal();
|
closeVariantActionModal();
|
||||||
await loadProject();
|
await loadProject();
|
||||||
await loadConfigs();
|
await loadConfigs();
|
||||||
updateDeleteVariantButton();
|
updateDeleteVariantButton();
|
||||||
notify('Вариант обновлён', 'success');
|
notify(updated && updated.variant_warning ? 'Вариант обновлён. ' + updated.variant_warning : 'Вариант обновлён', 'success');
|
||||||
}
|
}
|
||||||
|
|
||||||
async function createNewVariant() {
|
async function createNewVariant() {
|
||||||
@@ -860,10 +867,6 @@ async function createNewVariant() {
|
|||||||
showToast('Укажите вариант', 'error');
|
showToast('Укажите вариант', 'error');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!/^[A-Za-z0-9._-]+$/.test(variant)) {
|
|
||||||
showToast('Имя варианта содержит недопустимые символы. Разрешены: буквы, цифры, дефис, точка, подчёркивание.', 'error');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const payload = {
|
const payload = {
|
||||||
code: code,
|
code: code,
|
||||||
variant: variant,
|
variant: variant,
|
||||||
@@ -881,7 +884,11 @@ async function createNewVariant() {
|
|||||||
}
|
}
|
||||||
const created = await resp.json().catch(() => null);
|
const created = await resp.json().catch(() => null);
|
||||||
closeNewVariantModal();
|
closeNewVariantModal();
|
||||||
showToast('Вариант создан', 'success');
|
if (created && created.variant_warning) {
|
||||||
|
showToast('Вариант создан. ' + created.variant_warning, 'info');
|
||||||
|
} else {
|
||||||
|
showToast('Вариант создан', 'success');
|
||||||
|
}
|
||||||
if (created && created.uuid) {
|
if (created && created.uuid) {
|
||||||
window.location.href = '/projects/' + created.uuid;
|
window.location.href = '/projects/' + created.uuid;
|
||||||
return;
|
return;
|
||||||
@@ -1261,10 +1268,24 @@ function openProjectSettingsModal() {
|
|||||||
document.getElementById('project-settings-name').value = project.name || '';
|
document.getElementById('project-settings-name').value = project.name || '';
|
||||||
document.getElementById('project-settings-tracker-url').value = (project.tracker_url || '').trim();
|
document.getElementById('project-settings-tracker-url').value = (project.tracker_url || '').trim();
|
||||||
document.getElementById('project-settings-rental-enabled').checked = !!project.rental_enabled;
|
document.getElementById('project-settings-rental-enabled').checked = !!project.rental_enabled;
|
||||||
|
document.getElementById('project-settings-show-stock-prices').checked = !!project.show_stock_prices;
|
||||||
|
document.getElementById('project-settings-only-in-stock').checked = !!project.only_in_stock;
|
||||||
|
applyStockSettingsGating();
|
||||||
document.getElementById('project-settings-modal').classList.remove('hidden');
|
document.getElementById('project-settings-modal').classList.remove('hidden');
|
||||||
document.getElementById('project-settings-modal').classList.add('flex');
|
document.getElementById('project-settings-modal').classList.add('flex');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function applyStockSettingsGating() {
|
||||||
|
const showStockPrices = document.getElementById('project-settings-show-stock-prices').checked;
|
||||||
|
const onlyInStock = document.getElementById('project-settings-only-in-stock');
|
||||||
|
const wrap = document.getElementById('project-settings-only-in-stock-wrap');
|
||||||
|
onlyInStock.disabled = !showStockPrices;
|
||||||
|
if (!showStockPrices) {
|
||||||
|
onlyInStock.checked = false;
|
||||||
|
}
|
||||||
|
wrap.classList.toggle('opacity-50', !showStockPrices);
|
||||||
|
}
|
||||||
|
|
||||||
function closeProjectSettingsModal() {
|
function closeProjectSettingsModal() {
|
||||||
document.getElementById('project-settings-modal').classList.add('hidden');
|
document.getElementById('project-settings-modal').classList.add('hidden');
|
||||||
document.getElementById('project-settings-modal').classList.remove('flex');
|
document.getElementById('project-settings-modal').classList.remove('flex');
|
||||||
@@ -1277,6 +1298,8 @@ async function saveProjectSettings() {
|
|||||||
const name = document.getElementById('project-settings-name').value.trim();
|
const name = document.getElementById('project-settings-name').value.trim();
|
||||||
const trackerURL = document.getElementById('project-settings-tracker-url').value.trim();
|
const trackerURL = document.getElementById('project-settings-tracker-url').value.trim();
|
||||||
const rentalEnabled = document.getElementById('project-settings-rental-enabled').checked;
|
const rentalEnabled = document.getElementById('project-settings-rental-enabled').checked;
|
||||||
|
const showStockPrices = document.getElementById('project-settings-show-stock-prices').checked;
|
||||||
|
const onlyInStock = document.getElementById('project-settings-only-in-stock').checked;
|
||||||
if (!code) {
|
if (!code) {
|
||||||
alert('Введите код проекта');
|
alert('Введите код проекта');
|
||||||
return;
|
return;
|
||||||
@@ -1284,7 +1307,7 @@ async function saveProjectSettings() {
|
|||||||
const resp = await fetch('/api/projects/' + projectUUID, {
|
const resp = await fetch('/api/projects/' + projectUUID, {
|
||||||
method: 'PUT',
|
method: 'PUT',
|
||||||
headers: {'Content-Type': 'application/json'},
|
headers: {'Content-Type': 'application/json'},
|
||||||
body: JSON.stringify({code: code, variant: variant, name: name, tracker_url: trackerURL, rental_enabled: rentalEnabled})
|
body: JSON.stringify({code: code, variant: variant, name: name, tracker_url: trackerURL, rental_enabled: rentalEnabled, show_stock_prices: showStockPrices, only_in_stock: onlyInStock})
|
||||||
});
|
});
|
||||||
if (!resp.ok) {
|
if (!resp.ok) {
|
||||||
if (resp.status === 409) {
|
if (resp.status === 409) {
|
||||||
@@ -1521,6 +1544,12 @@ function openExportModal() {
|
|||||||
const modal = document.getElementById('project-export-modal');
|
const modal = document.getElementById('project-export-modal');
|
||||||
if (!modal) return;
|
if (!modal) return;
|
||||||
setProjectExportStatus('', '');
|
setProjectExportStatus('', '');
|
||||||
|
const stockCheckbox = document.getElementById('export-col-stock');
|
||||||
|
const showStockPrices = !!(project && project.show_stock_prices);
|
||||||
|
stockCheckbox.disabled = !showStockPrices;
|
||||||
|
if (!showStockPrices) {
|
||||||
|
stockCheckbox.checked = false;
|
||||||
|
}
|
||||||
modal.classList.remove('hidden');
|
modal.classList.remove('hidden');
|
||||||
modal.classList.add('flex');
|
modal.classList.add('flex');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -406,10 +406,6 @@ async function createProject() {
|
|||||||
alert('Код проекта содержит недопустимые символы.\nРазрешены: буквы, цифры, дефис, точка, подчёркивание.');
|
alert('Код проекта содержит недопустимые символы.\nРазрешены: буквы, цифры, дефис, точка, подчёркивание.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (variant && !/^[A-Za-z0-9._-]+$/.test(variant)) {
|
|
||||||
alert('Имя варианта содержит недопустимые символы.\nРазрешены: буквы, цифры, дефис, точка, подчёркивание.');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const resp = await fetch('/api/projects', {
|
const resp = await fetch('/api/projects', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {'Content-Type': 'application/json'},
|
headers: {'Content-Type': 'application/json'},
|
||||||
@@ -433,7 +429,11 @@ async function createProject() {
|
|||||||
alert('Не удалось создать проект');
|
alert('Не удалось создать проект');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
const created = await resp.json().catch(() => null);
|
||||||
closeCreateProjectModal();
|
closeCreateProjectModal();
|
||||||
|
if (created && created.variant_warning) {
|
||||||
|
alert(created.variant_warning);
|
||||||
|
}
|
||||||
loadProjects();
|
loadProjects();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -511,6 +511,9 @@ async function copyProject(projectUUID, projectName) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const newProject = await createResp.json();
|
const newProject = await createResp.json();
|
||||||
|
if (newProject.variant_warning) {
|
||||||
|
alert(newProject.variant_warning);
|
||||||
|
}
|
||||||
|
|
||||||
const listResp = await fetch('/api/projects/' + projectUUID + '/configs');
|
const listResp = await fetch('/api/projects/' + projectUUID + '/configs');
|
||||||
if (!listResp.ok) {
|
if (!listResp.ok) {
|
||||||
|
|||||||
+104
-24
@@ -4,26 +4,39 @@
|
|||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>OFS - Настройка подключения</title>
|
<title>QuoteForge — Настройки</title>
|
||||||
<link rel="stylesheet" href="/static/app.css">
|
<link rel="stylesheet" href="/static/app.css">
|
||||||
<script src="/static/vendor/tailwindcss.browser.js"></script>
|
<script src="/static/vendor/tailwindcss.browser.js"></script>
|
||||||
</head>
|
</head>
|
||||||
<body class="bg-gray-100 min-h-screen flex items-center justify-center">
|
<body class="bg-gray-100 min-h-screen">
|
||||||
<div class="max-w-md w-full mx-4">
|
<div class="max-w-4xl w-full mx-auto px-4 py-10">
|
||||||
<div class="bg-white rounded-lg shadow-lg p-8">
|
{{if .Settings}}
|
||||||
<div class="text-center mb-8">
|
<div class="mb-4">
|
||||||
<h1 class="text-2xl font-bold text-blue-600">QuoteForge</h1>
|
<a href="/" class="inline-flex items-center gap-1.5 text-sm text-blue-600 hover:text-blue-800">
|
||||||
<p class="text-gray-600 mt-2">Настройка подключения к базе данных</p>
|
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
</div>
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 19l-7-7m0 0l7-7m-7 7h18"/>
|
||||||
|
|
||||||
<div class="bg-amber-50 border border-amber-300 rounded-md p-3 mb-4 flex items-start gap-2">
|
|
||||||
<svg class="w-5 h-5 text-amber-500 mt-0.5 shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/>
|
|
||||||
</svg>
|
</svg>
|
||||||
<p class="text-sm text-amber-800"><span class="font-semibold">Важно:</span> не закрывайте консольное окно приложения — без него программа не работает.</p>
|
Вернуться в приложение
|
||||||
</div>
|
</a>
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
|
<div class="text-center mb-6">
|
||||||
|
<h1 class="text-2xl font-bold text-blue-600">QuoteForge</h1>
|
||||||
|
<p class="text-gray-600 mt-1">Настройки</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
<form id="setup-form" class="space-y-4">
|
<div class="bg-amber-50 border border-amber-300 rounded-md p-3 mb-6 flex items-start gap-2">
|
||||||
|
<svg class="w-5 h-5 text-amber-500 mt-0.5 shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/>
|
||||||
|
</svg>
|
||||||
|
<p class="text-sm text-amber-800"><span class="font-semibold">Важно:</span> не закрывайте консольное окно приложения — без него программа не работает.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="grid gap-6 md:grid-cols-2">
|
||||||
|
<div class="bg-white rounded-lg shadow-lg p-6 flex flex-col">
|
||||||
|
<h2 class="text-lg font-semibold text-gray-800 mb-4">Подключение к базе данных</h2>
|
||||||
|
|
||||||
|
<form id="setup-form" class="space-y-4 flex flex-col flex-1">
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Хост сервера</label>
|
<label class="block text-sm font-medium text-gray-700 mb-1">Хост сервера</label>
|
||||||
<input type="text" name="host" id="host"
|
<input type="text" name="host" id="host"
|
||||||
@@ -68,13 +81,7 @@
|
|||||||
|
|
||||||
<div id="status" class="hidden p-3 rounded-md text-sm"></div>
|
<div id="status" class="hidden p-3 rounded-md text-sm"></div>
|
||||||
|
|
||||||
<div class="flex space-x-3 pt-4">
|
<div class="flex space-x-3 pt-4 mt-auto">
|
||||||
{{if .Settings}}
|
|
||||||
<a href="/"
|
|
||||||
class="flex-1 px-4 py-2 bg-gray-100 text-gray-700 rounded-md hover:bg-gray-200 transition text-center">
|
|
||||||
Назад
|
|
||||||
</a>
|
|
||||||
{{end}}
|
|
||||||
<button type="button" onclick="testConnection()"
|
<button type="button" onclick="testConnection()"
|
||||||
class="flex-1 px-4 py-2 bg-gray-100 text-gray-700 rounded-md hover:bg-gray-200 transition">
|
class="flex-1 px-4 py-2 bg-gray-100 text-gray-700 rounded-md hover:bg-gray-200 transition">
|
||||||
Проверить
|
Проверить
|
||||||
@@ -87,8 +94,56 @@
|
|||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p class="text-center text-gray-500 text-sm mt-4">
|
<div class="bg-white rounded-lg shadow-lg p-6 flex flex-col">
|
||||||
QuoteForge v1.0 - Конфигуратор серверов
|
<h2 class="text-lg font-semibold text-gray-800">Индикаторы</h2>
|
||||||
|
<p class="text-sm text-gray-600 mt-1 mb-4">
|
||||||
|
Часть подсказок в интерфейсе передаётся только цветом: качество цены в спецификации
|
||||||
|
и на вкладке «Ценообразование», цены-заглушки, неполные итоги. Выберите режим без
|
||||||
|
цветовой кодировки, если цвета трудно различать.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div class="space-y-3">
|
||||||
|
<label class="flex items-start gap-3 p-3 border border-gray-200 rounded-md cursor-pointer hover:bg-gray-50">
|
||||||
|
<input type="radio" name="indicator-mode" value="color" class="mt-1"
|
||||||
|
{{if ne .IndicatorMode "accessible"}}checked{{end}}>
|
||||||
|
<span class="flex-1">
|
||||||
|
<span class="block text-sm font-medium text-gray-800">Цветовая индикация</span>
|
||||||
|
<span class="block text-xs text-gray-500 mt-0.5">Шкала «красный → жёлтый → зелёный», подсветка ячеек.</span>
|
||||||
|
<span class="inline-flex items-center gap-1.5 mt-2">
|
||||||
|
<span class="inline-block w-2 h-2 rounded-full" style="background-color:rgb(220,38,38)"></span>
|
||||||
|
<span class="inline-block w-2 h-2 rounded-full" style="background-color:rgb(234,179,8)"></span>
|
||||||
|
<span class="inline-block w-2 h-2 rounded-full" style="background-color:rgb(22,163,74)"></span>
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<label class="flex items-start gap-3 p-3 border border-gray-200 rounded-md cursor-pointer hover:bg-gray-50">
|
||||||
|
<input type="radio" name="indicator-mode" value="accessible" class="mt-1"
|
||||||
|
{{if eq .IndicatorMode "accessible"}}checked{{end}}>
|
||||||
|
<span class="flex-1">
|
||||||
|
<span class="block text-sm font-medium text-gray-800">Без цветовой кодировки</span>
|
||||||
|
<span class="block text-xs text-gray-500 mt-0.5">Значок-«сигнал» из 5 столбиков и текстовые пометки вместо цвета.</span>
|
||||||
|
<span class="inline-flex items-end gap-2 mt-2">
|
||||||
|
<span class="qf-quality-meter"><i></i><i></i><i></i><i></i><i></i></span>
|
||||||
|
<span class="qf-quality-meter"><i class="on"></i><i class="on"></i><i></i><i></i><i></i></span>
|
||||||
|
<span class="qf-quality-meter"><i class="on"></i><i class="on"></i><i class="on"></i><i class="on"></i><i class="on"></i></span>
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-auto pt-4">
|
||||||
|
<div id="indicator-status" class="hidden mb-3 p-2 rounded-md text-sm"></div>
|
||||||
|
<button type="button" onclick="saveIndicatorMode()"
|
||||||
|
class="px-4 py-2 bg-blue-600 text-white rounded-md hover:bg-blue-700 transition">
|
||||||
|
Сохранить
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p class="text-center text-gray-500 text-sm mt-8">
|
||||||
|
QuoteForge {{.AppVersion}} — Конфигуратор серверов
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -159,6 +214,31 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function saveIndicatorMode() {
|
||||||
|
const mode = document.querySelector('input[name="indicator-mode"]:checked')?.value || 'color';
|
||||||
|
const box = document.getElementById('indicator-status');
|
||||||
|
box.className = 'mb-3 p-2 rounded-md text-sm bg-blue-100 text-blue-800';
|
||||||
|
box.textContent = 'Сохранение...';
|
||||||
|
try {
|
||||||
|
const resp = await fetch('/api/settings/ui', {
|
||||||
|
method: 'PUT',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({ indicator_mode: mode }),
|
||||||
|
});
|
||||||
|
const data = await resp.json();
|
||||||
|
if (resp.ok) {
|
||||||
|
box.className = 'mb-3 p-2 rounded-md text-sm bg-green-100 text-green-800';
|
||||||
|
box.textContent = '✓ Сохранено. Изменения появятся при следующем открытии страниц.';
|
||||||
|
} else {
|
||||||
|
box.className = 'mb-3 p-2 rounded-md text-sm bg-red-100 text-red-800';
|
||||||
|
box.textContent = data.error || 'Не удалось сохранить';
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
box.className = 'mb-3 p-2 rounded-md text-sm bg-red-100 text-red-800';
|
||||||
|
box.textContent = 'Ошибка сети: ' + e.message;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function checkServerReady() {
|
async function checkServerReady() {
|
||||||
let attempts = 0;
|
let attempts = 0;
|
||||||
const maxAttempts = 30; // 30 seconds max
|
const maxAttempts = 30; // 30 seconds max
|
||||||
|
|||||||
Reference in new issue
Block a user