PulseUI

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PUL-7878

PUL-7828_Hub Spoke: Re-design of Market Selection: Hub Spoke tab

    • -0
    • +8
    /pulsedb/tables/sell_down_product.sql
    • -0
    • +47
    /pulsedb/views/hs_network_hierarchy_v.sql
PUL-7870_Create procedure to copy Hub Spoke rolled up PTS to SITE_PRODUCT

    • -0
    • +29
    /pulsedb/procedures/update_hs_pts.sql
PUL-7865_Adding Systems will only removes items from return and adds items to the order

PUL-7862_Hub Spoke: Remove all Sell Down logic

Merge branch 'develop' of https://auapgpdgitapp01.genpt.net/Pulse/PulseUI into develop

PUL-7859_Hub Spoke: Business Rule 3: ISP plus Last Sold Rule

    • -91
    • +153
    /pulsedb/procedures/uap_sp_pulse_rules_isp_change.sql
    • -61
    • +109
    /pulsedb/procedures/uap_sp_pulse_rules_isp_global.sql
    • -102
    • +201
    /pulsedb/procedures/us_sp_pulse_rules.sql
    • -95
    • +159
    /pulsedb/procedures/us_sp_pulse_rules_isp_change.sql
    • -64
    • +115
    /pulsedb/procedures/us_sp_pulse_rules_isp_global.sql
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
Resolve PUL-7710 and PUL-7828

Merge branch 'PUL-7710' into 'develop'

Resolve PUL-7710 and PUL-7828

Closes PUL-7710, PUL-7849, and PUL-7848

See merge request Pulse/PulseUI!493

PUL-7710-"Review Comments Addressed for Adding Padding and Api Access for DMOD user"

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

Merge branch 'PUL-7710' into 'develop'

Resolve PUL-7710 and PUL-7872

Closes PUL-7710, PUL-7849, and PUL-7848

See merge request Pulse/PulseUI!492

Resolve PUL-7710 and PUL-7872

PUL-7710-"Query Changes"

PUL-7710-"Merge Conflict"

Merge branch 'PUL-7828' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PUL-7710

 Conflicts:

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

PUL-7710-"Changes For Export Excel"

Product page fix

Redesign hub-spoke dashboard

PUL-7828 - Hub Spoke Dashboard redesign changes

Merge branches 'PUL-7828' and 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PUL-7828

Merge branch 'PUL-7828' into 'develop'

Resolve PUL-7848 , PUL-7849 and PUL-7856

Closes PUL-7848 and PUL-7849

See merge request Pulse/PulseUI!490

Resolve PUL-7848 , PUL-7849 and PUL-7856

    • -0
    • +36
    /src/main/java/com/napa/pulse/dto/ProductMapDto.java
    • -0
    • +31
    /src/main/java/com/napa/pulse/dto/SpokeSiteDto.java
    • -0
    • +20
    /src/main/webapp/app/src/_scss/pulse.scss
Resolve PUL-7849

Merge branch 'PUL-7849' into 'PUL-7828'

Resolve PUL-7849

See merge request Pulse/PulseUI!489

Merge branch 'PUL-7828' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PUL-7849

Conflict resolved

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

 Conflicts:

 src/main/java/com/napa/pulse/controller/rest/HubSpokeNetworkController.java

 src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java

 src/main/java/com/napa/pulse/dao/interfaces/HubSpokeNetworkDAO.java

 src/main/java/com/napa/pulse/service/impl/HubSpokeNetworkServiceImpl.java

 src/main/java/com/napa/pulse/service/interfaces/HubSpokeNetworkService.java