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 PO-643

 Conflicts:

 pom.xml

    • -1
    • +7
    ./napa/pulse/dao/impl/SessionDAOImpl.java
bug fix

    • -4
    • +4
    ./napa/pulse/dao/impl/SessionDAOImpl.java
    • -20
    • +19
    ./napa/pulse/entity/pulseui/MinMaxSitePref.java
    • -1
    • +1
    ./napa/pulse/service/impl/LeadTimeServiceImpl.java
  1. … 1 more file in changeset.
Merge branch 'PO-643' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PO_Test_643

# Conflicts:

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

    • -4
    • +13
    ./napa/pulse/dao/impl/SessionDAOImpl.java
Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PO_Test_643

# Conflicts:

# pom.xml

    • -1
    • +7
    ./napa/pulse/dao/impl/SessionDAOImpl.java
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/develop'

    • -13
    • +269
    ./napa/pulse/service/impl/ExportServiceImpl.java
test methods related to leadTime

    • -12
    • +11
    ./napa/pulse/dao/impl/SessionDAOImpl.java
  1. … 3 more files in changeset.
Merging Develop branch

Merging Develop branch

    • -93
    • +634
    ./napa/pulse/dao/impl/ReviewDAOImpl.java
PO-643 -Lead_Time_status_Payload

    • -4
    • +13
    ./napa/pulse/dao/impl/SessionDAOImpl.java
    • -0
    • +1
    ./napa/pulse/dao/impl/SiteGroupDAOImpl.java
    • -1
    • +1
    ./napa/pulse/dao/interfaces/SessionDAO.java
    • -0
    • +21
    ./napa/pulse/dto/LeadTimeStatusDTO.java
PO-833 change

    • -1
    • +7
    ./napa/pulse/dao/impl/SessionDAOImpl.java
update session creation payload with new param

  1. … 1 more file in changeset.
Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PO_Test_643

# Conflicts:

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

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

    • -733
    • +923
    ./napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
    • -1073
    • +2543
    ./napa/pulse/dao/impl/ReviewDAOImpl.java
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/develop'

    • -13
    • +269
    ./napa/pulse/service/impl/ExportServiceImpl.java
PO-643 -Lead_Time_status

    • -4
    • +20
    ./napa/pulse/dao/impl/SiteGroupDAOImpl.java
    • -0
    • +1
    ./napa/pulse/dao/interfaces/SiteGroupDAO.java
  1. … 2 more files in changeset.
fix for 0to1 reviewpage advance filter

    • -25
    • +50
    ./napa/pulse/dao/impl/ReviewDAOImpl.java
shub demand sales, dc sales, smarthubcount>0 changes

    • -115
    • +197
    ./napa/pulse/dao/impl/ReviewDAOImpl.java
    • -185
    • +216
    ./napa/pulse/service/impl/ExportServiceImpl.java
session preference change

    • -1
    • +2
    ./napa/pulse/dao/impl/SessionDAOImpl.java
Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PO-806

    • -49
    • +53
    ./napa/pulse/dao/impl/ReviewDAOImpl.java
prodline table change

    • -5
    • +7
    ./napa/pulse/dao/impl/SessionDAOImpl.java
prodline table change

    • -11
    • +14
    ./napa/pulse/dao/impl/SessionDAOImpl.java
    • -1
    • +1
    ./napa/pulse/dao/impl/SiteLogbookDAOImpl.java
    • -2
    • +2
    ./napa/pulse/dao/interfaces/SessionDAO.java
    • -65
    • +128
    ./napa/pulse/dao/impl/ReviewDAOImpl.java
  1. … 2 more files in changeset.
prodline table change

    • -3
    • +1
    ./napa/pulse/dao/impl/SessionDAOImpl.java
    • -3
    • +5
    ./napa/pulse/dto/ProductLinesData.java
exportexcel query chages for min hub site count and filter changes are projected in export excel

Lead time changes product line and create new session new parameter added

    • -0
    • +9
    ./napa/pulse/dto/ProductLinesData.java
Lead time changes product line and create new session new parameter added

    • -101
    • +123
    ./napa/pulse/dao/impl/SessionDAOImpl.java
    • -2
    • +3
    ./napa/pulse/dao/interfaces/SessionDAO.java
    • -2
    • +1
    ./napa/pulse/service/impl/LeadTimeServiceImpl.java
Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into Po-835_dc_sales_filter

    • -6
    • +68
    ./napa/pulse/dao/impl/ReviewDAOImpl.java
    • -1
    • +47
    ./napa/pulse/service/impl/ExportServiceImpl.java
DC-SALES-FILTER_

    • -40
    • +40
    ./napa/pulse/dao/impl/ReviewDAOImpl.java
Merge branch 'PO-806' into 'develop'

PO-840 2 may 24

Closes PO-806

See merge request Pulse/PulseUI!1014

    • -6
    • +68
    ./napa/pulse/dao/impl/ReviewDAOImpl.java
DC-SALES-FILTER

    • -118
    • +55
    ./napa/pulse/dao/impl/ReviewDAOImpl.java
exportexcel query chages for min hub site count and filter changes are projected in export excel

    • -1
    • +47
    ./napa/pulse/service/impl/ExportServiceImpl.java