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-879_sales_potential

    • -19
    • +20
    ./napa/pulse/dao/impl/ReviewDAOImpl.java
PO-879-sales_potential

    • -16
    • +46
    ./napa/pulse/dao/impl/ReviewDAOImpl.java
    • -6
    • +17
    ./napa/pulse/service/impl/ExportServiceImpl.java
  1. … 2 more files in changeset.
Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PO-643

 Conflicts:

 src/main/webapp/app/src/session/dashboard/templates/sessionDashboardFilterPanel.html

    • -5
    • +28
    ./napa/pulse/dao/impl/SessionDAOImpl.java
    • -2
    • +2
    ./napa/pulse/dao/interfaces/SessionDAO.java
  1. … 2 more files in changeset.
Lead Time Changes

    • -34
    • +19
    ./napa/pulse/service/impl/LeadTimeServiceImpl.java
property and lead time chnaged

    • -7
    • +10
    ./napa/pulse/service/impl/LeadTimeServiceImpl.java
  1. … 1 more file in changeset.
leadtime int to string change

    • -5
    • +8
    ./napa/pulse/service/impl/LeadTimeServiceImpl.java
  1. … 1 more file in changeset.
Changed IDNumber from Integer to String and updated the Lead Time logic by removing unused object

    • -2
    • +2
    ./napa/pulse/dao/impl/AdminDAOImpl.java
    • -4
    • +4
    ./napa/pulse/dao/impl/SiteDAOImpl.java
    • -2
    • +2
    ./napa/pulse/dao/impl/VirtualSiteDAOImpl.java
    • -10
    • +10
    ./napa/pulse/service/impl/LeadTimeServiceImpl.java
Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PO-643

    • -5
    • +7
    ./napa/pulse/dao/impl/SessionDAOImpl.java
    • -1
    • +2
    ./napa/pulse/dao/interfaces/SessionDAO.java
  1. … 3 more files in changeset.
filter changes for sales history

    • -5
    • +28
    ./napa/pulse/dao/impl/SessionDAOImpl.java
    • -2
    • +2
    ./napa/pulse/dao/interfaces/SessionDAO.java
PO-866 change 14 june 24

    • -1
    • +1
    ./napa/pulse/dao/impl/SessionDAOImpl.java
finalize query change updated

    • -4
    • +4
    ./napa/pulse/dao/impl/SessionDAOImpl.java
PO-866 change 12 june 24

    • -1
    • +1
    ./napa/pulse/dao/impl/ParametersDAOImpl.java
    • -1
    • +2
    ./napa/pulse/dao/impl/SessionDAOImpl.java
    • -3
    • +40
    ./napa/pulse/dao/impl/UserDAOImpl.java
    • -0
    • +2
    ./napa/pulse/dao/interfaces/UserDAO.java
condition finilize

    • -1
    • +1
    ./napa/pulse/dao/impl/SessionDAOImpl.java
change payload request api

  1. … 1 more file in changeset.
PO_864_service

    • -2
    • +3
    ./napa/pulse/dao/impl/SessionDAOImpl.java
    • -1
    • +2
    ./napa/pulse/dao/interfaces/SessionDAO.java
leadtime filter bug fix

    • -5
    • +14
    ./napa/pulse/dao/impl/SessionDAOImpl.java
leadtime chnages

    • -2
    • +2
    ./napa/pulse/dao/impl/SessionDAOImpl.java
properties changes

  1. … 2 more files in changeset.
exisiting test class created issue fixed it

  1. … 1 more file in changeset.
testcase issue

Merge branch 'PO-643' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PO-643

    • -1
    • +2
    ./napa/pulse/dao/impl/SessionDAOImpl.java
Lead time logger

    • -5
    • +5
    ./napa/pulse/dao/impl/SessionDAOImpl.java
merge conflicts

    • -12
    • +14
    ./napa/pulse/dao/impl/SessionDAOImpl.java
  1. … 3 more files in changeset.
error in review changes

    • -12
    • +13
    ./napa/pulse/dao/impl/ReviewDAOImpl.java
  1. … 1 more file in changeset.
changes are committed

    • -52
    • +24
    ./napa/pulse/dao/impl/ReviewDAOImpl.java
    • -4
    • +4
    ./napa/pulse/entity/pulseui/LeadTime.java
    • -2
    • +2
    ./napa/pulse/service/impl/LeadTimeServiceImpl.java
unit testcases are added

    • -9
    • +10
    ./napa/pulse/dao/impl/SessionDAOImpl.java
    • -1
    • +1
    ./napa/pulse/dao/interfaces/SessionDAO.java
  1. … 1 more file in changeset.
Lead time status preferences

    • -6
    • +6
    ./napa/pulse/dao/impl/SessionDAOImpl.java
  1. … 2 more files in changeset.
Lead time status.

    • -3
    • +4
    ./napa/pulse/dao/impl/SessionDAOImpl.java
    • -1
    • +1
    ./napa/pulse/dao/interfaces/SessionDAO.java
Merge branch 'PO-643' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PO_Test_643

# Conflicts:

# pom.xml

    • -20
    • +36
    ./napa/pulse/dao/impl/SessionDAOImpl.java
  1. … 1 more file in changeset.
Lead time status.

    • -1
    • +1
    ./napa/pulse/dao/interfaces/SessionDAO.java