PulseUI

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'develop' into add-PTS-to-review-page-POC

Resolve PUL-7355 "Redesign clean up part 2"

Merge branch 'PUL-7355-redesign-clean-up-part-2' into 'develop'

Resolve PUL-7355 "Redesign clean up part 2"

Closes PUL-7355

See merge request Pulse/PulseUI!271

Merge branch 'PUL-7288-criticality-tooltip-add-linebreak' into 'develop'

[PUL-7366] Change criticality tooltip text - UI change

Closes PUL-7288

See merge request Pulse/PulseUI!270

Merge branch 'PUL-7327-sales-demand-rebranding-to-sold-not-stocked' into 'develop'

Resolve PUL-7327 "Sales demand rebranding to sold not stocked"

Closes PUL-7327

See merge request Pulse/PulseUI!269

Merge branch 'develop' into 'PUL-7327-sales-demand-rebranding-to-sold-not-stocked'

# Conflicts:

# src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java

# src/main/java/com/napa/pulse/dto/SKUTableWidgetData.java

# src/main/webapp/app/src/session/review/desktopWidgets/siteSkuDetail.html

[PUL-7366] Change criticality tooltip text - UI change

fixing issue for isSoldNotStocked for multisite. The values are returned from site_product and it does not have the recommended_order_qty

Logging sql's Making update to flag from 'true'/'false' to 1/0

The below changes are made and tested on local, third change yet to be made.

Change the parameter from "includeSalesDemand" to "includeSoldNotStocked" to the api for creating session -> /auth/sessions

Change the parameter from "isLostSales" to "isSoldNotStocked" to the api for fetching session review table and count

a) auth/sku-table-widget-data-count

b) auth/sku-table-widget-data

    • -1
    • +0
    /src/main/webapp/app/src/_scss/pulse.scss
Merge branch 'PUL-7327-sales-demand-rebranding-to-sold-not-stocked' into 'develop'

Resolve PUL-7327 "Sales demand rebranding to sold not stocked"

Closes PUL-7327

See merge request Pulse/PulseUI!267

Merge branch 'PUL-7327-sales-demand-rebranding-to-sold-not-stocked' into 'develop'

Resolve PUL-7327 "Sales demand rebranding to sold not stocked"

Closes PUL-7327

See merge request Pulse/PulseUI!264

The below changes are made and tested on local, third change yet to be made.

Change the parameter from "includeSalesDemand" to "includeSoldNotStocked" to the api for creating session -> /auth/sessions

Change the parameter from "isLostSales" to "isSoldNotStocked" to the api for fetching session review table and count

a) auth/sku-table-widget-data-count

b) auth/sku-table-widget-data

    • -3
    • +11
    /src/main/webapp/app/tailwind.config.js
Resolve PUL-7355 "Redesign clean up part 2"

    • -10
    • +6
    /src/main/webapp/app/src/_scss/pulse.scss
    • -13
    • +19
    /src/main/webapp/app/src/fleets/addVehicleCtrl.js
Merge branch 'PUL-7355-redesign-clean-up-part-2' into 'develop'

Resolve PUL-7355 "Redesign clean up part 2"

Closes PUL-7355

See merge request Pulse/PulseUI!266

Merge branch 'PUL-7344-vio-filtering-change' into 'develop'

Resolve PUL-7344 "Vio filtering change"

Closes PUL-7344

See merge request Pulse/PulseUI!265

PTS-to-review-page-POC --p2

Merge branch 'redesign-ui-with-tailwindcss' into add-PTS-to-review-page-POC

[PUL-7344] Review page vio filtering change -- UI - intergration

Updating to use operator from UI in queries

[PUL-7344] Review page vio filtering change -- UI

fixing the issue with the sql statement.

redesign ui - phase 2 -- Part 1

adding new field "isSoldNotStocked" to the api "auth/site-sku-details-table-widget-data" to display the "Sold" red icon on site sku detail table

redesign ui - phase 2

    • -1
    • +0
    /src/main/webapp/app/src/_scss/pulse.scss
PTS-to-review-page-POC

PTS-to-review-page-POC

[PUL-7344] Review page vio filtering change

The below changes are made and tested on local, third change yet to be made.

Change the parameter from "includeSalesDemand" to "includeSoldNotStocked" to the api for creating session -> /auth/sessions

Change the parameter from "isLostSales" to "isSoldNotStocked" to the api for fetching session review table and count

a) auth/sku-table-widget-data-count

b) auth/sku-table-widget-data

PUL-7293 Business Rules edit: Sales Rule 4: consider 4+ sales --> consider 2+ sales