Clone
 

pctr766664 <pctr76666@genpt.net> in PulseUI

PUL-7899 conflict resolve

    • -155
    • +142
    /src/main/webapp/app/src/apis/reviewPageApi.js
Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PUL-7899

 Conflicts:

 src/main/webapp/app/src/apis/reviewPageApi.js

 src/main/webapp/app/src/session/review/sessionReviewCtrl.js

    • -142
    • +155
    /src/main/webapp/app/src/apis/reviewPageApi.js
PUL-7899 29.09.21 changes

    • -219
    • +230
    /src/main/webapp/app/src/apis/reviewPageApi.js
PUL-7799-'inclusion for Spoke sites/products'

PUL-7825-'Parameter Slider for SJ or DNS Incorrect Color when Expanded Changes'

    • -646
    • +653
    /src/main/webapp/app/src/_scss/parameter.scss
inclusion for Spoke sites/products

inclusion for Spoke sites/products

jira 7725 082321

Review Filter 7768 local changes

Review Filter 7768 local changes

Review Filter 7768 local

Review Filter 7768 local changes

vendor filter

query change

Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PUL-7827

Vendor Filter loading icon and Remove Vendor Filter feature

Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PUL-7779

 Conflicts:

 src/main/webapp/app/src/session/marketSelection/templates/siteProductSelectionDialog.html

review page hub & spoke filter

    • -221
    • +208
    /src/main/webapp/app/src/apis/reviewPageApi.js
Merge branch 'PUL-7779' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into develop

 Conflicts:

 src/main/webapp/app/src/session/marketSelection/templates/siteProductSelectionDialog.html

Vendor Filter loading icon

    • -6064
    • +6102
    /src/main/webapp/app/src/_scss/pulse.scss
Feature - Vendor Filter for Hub Spoke Product Selection

formatting the js

vendor filter all changes upto 26/7/2021

commit1

    • -0
    • +14
    /src/main/java/com/napa/pulse/dto/ProductIdDTO.java
    • -0
    • +26
    /src/main/java/com/napa/pulse/dto/VendorDataDTO.java
Service part for Vendor Filter - 13/7/21(Tue)

    • -0
    • +15
    /src/main/java/com/napa/pulse/dto/ProductIdDTO.java
    • -0
    • +22
    /src/main/java/com/napa/pulse/dto/VendorData.java
Vendor_Data.java file still need to be added