PulseUI

Clone Tools
More
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 24 Feb 2022
10:37 am

Raj Babu <raj_babu@genpt.com>

Revert "Merge branch 'PUL-8043' into 'develop'"

This reverts merge request !604

Options
    • -8
    • +2
    /src/main/java/com/napa/pulse/controller/rest/HubSpokeNetworkController.java
    • -25
    • +3
    /src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
    • -3
    • +1
    /src/main/java/com/napa/pulse/dao/interfaces/HubSpokeNetworkDAO.java
    • -9
    • +0
    /src/main/java/com/napa/pulse/dto/ProductMapDto.java
    • -9
    • +2
    /src/main/java/com/napa/pulse/service/impl/HubSpokeNetworkServiceImpl.java
    • -3
    • +1
    /src/main/java/com/napa/pulse/service/interfaces/HubSpokeNetworkService.java
    • -9
    • +2
    /src/main/webapp/app/src/repositories/hubSpokeRepo.js
    • -22
    • +2
    /src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js
    • -8
    • +1
    /src/main/webapp/app/src/session/marketSelection/templates/siteProductSelectionDialog.html
10:31 am

Shoban Sriram

Merge branch 'revert-00591176' into 'develop'

Revert "Merge branch 'PUL-8059' into 'develop'"

See merge request Pulse/PulseUI!608

Options
10:25 am

Raj Babu <raj_babu@genpt.com>

Revert "Merge branch 'PUL-8059' into 'develop'"

This reverts merge request !605

Options
    • -239
    • +242
    /src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
    • -7
    • +5
    /src/main/java/com/napa/pulse/dao/impl/ProductGroupDAOImpl.java
    • -10
    • +0
    /src/main/java/com/napa/pulse/dto/ProductGroupDTO.java
    • -8
    • +0
    /src/main/java/com/napa/pulse/dto/SpokeSiteDto.java
    • -12
    • +0
    /src/main/java/com/napa/pulse/entity/pulseui/Site.java
    • -1
    • +0
    /src/main/webapp/app/src/repositories/productGroupRepo.js
    • -1
    • +0
    /src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js
    • -8
    • +0
    /src/main/webapp/app/src/session/marketSelection/templates/siteProductSelectionDialog.html
    • -12
    • +2
    /src/main/webapp/app/src/session/preferences/sessionPreferenceCtrl.js
Tuesday 22 Feb 2022
12:33 pm

Shoban Sriram

Merge branch 'PUL-8059' into 'develop'

Resolve PUL-8059

Closes PUL-8059

See merge request Pulse/PulseUI!605

Options
6:23 am

Aqueel Ahamad

PUL-8059 Hub Spoke: Product Mapping: Auto-create Product Group

Options
    • -5
    • +7
    /src/main/java/com/napa/pulse/dao/impl/ProductGroupDAOImpl.java
    • -0
    • +10
    /src/main/java/com/napa/pulse/dto/ProductGroupDTO.java
    • -0
    • +1
    /src/main/webapp/app/src/repositories/productGroupRepo.js
    • -1
    • +1
    /src/main/webapp/app/src/session/marketSelection/templates/siteProductSelectionDialog.html
    • -2
    • +12
    /src/main/webapp/app/src/session/preferences/sessionPreferenceCtrl.js
Monday 21 Feb 2022
4:50 am

Aqueel Ahamad

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

Options
    • -3
    • +25
    /src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
    • -2
    • +22
    /src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js
    • -1
    • +8
    /src/main/webapp/app/src/session/marketSelection/templates/siteProductSelectionDialog.html
4:49 am

Aqueel Ahamad

PUL-8059 Hub Spoke: Product Mapping: Auto-create Product Group

Options
    • -242
    • +239
    /src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
    • -0
    • +8
    /src/main/java/com/napa/pulse/dto/SpokeSiteDto.java
    • -0
    • +12
    /src/main/java/com/napa/pulse/entity/pulseui/Site.java
    • -0
    • +1
    /src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js
    • -0
    • +8
    /src/main/webapp/app/src/session/marketSelection/templates/siteProductSelectionDialog.html
Wednesday 16 Feb 2022
2:25 pm

Raj Babu <raj_babu@genpt.com>

Merge branch 'PUL-8043' into 'develop'

FIX:PUL-8043:Hub Spoke: Product Mapping: Set Demand Threshold

Closes PUL-8043

See merge request Pulse/PulseUI!604

Options
11:10 am

Tulasiram N

pUL-8043:Hub Spoke: Product Mapping: Set Demand Threshold

Options
    • -2
    • +8
    /src/main/java/com/napa/pulse/controller/rest/HubSpokeNetworkController.java
    • -3
    • +25
    /src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
    • -1
    • +3
    /src/main/java/com/napa/pulse/dao/interfaces/HubSpokeNetworkDAO.java
    • -0
    • +9
    /src/main/java/com/napa/pulse/dto/ProductMapDto.java
    • -2
    • +9
    /src/main/java/com/napa/pulse/service/impl/HubSpokeNetworkServiceImpl.java
    • -1
    • +3
    /src/main/java/com/napa/pulse/service/interfaces/HubSpokeNetworkService.java
    • -2
    • +9
    /src/main/webapp/app/src/repositories/hubSpokeRepo.js
    • -2
    • +22
    /src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js
    • -1
    • +8
    /src/main/webapp/app/src/session/marketSelection/templates/siteProductSelectionDialog.html
Friday 11 Feb 2022
1:54 pm

Raj Babu <raj_babu@genpt.com>

Merge branch 'PUL-8054' into 'develop'

Fix - Bug: Min Max: Prod: Finalized session #445303: Orange Bar and Dashboard blank

Closes PUL-8054

See merge request Pulse/PulseUI!603

Options
11:48 am

Rahul Chaudhary

Fix - Bug: Min Max: Prod: Finalized session #445303: Orange Bar and Dashboard blank

Options
    • -34
    • +35
    /src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
    • -4
    • +4
    /src/main/java/com/napa/pulse/dao/impl/SiteLogbookDAOImpl.java
9:48 am

Raj Babu <raj_babu@genpt.com>

Merge branch 'PUL-8046' into 'develop'

Resolve PUL-8046

Closes PUL-8046

See merge request Pulse/PulseUI!602

Options
6:30 am

Aqueel Ahamad

PUL-8046 Max 50 character issue in site log Issue Resolve

Options
    • -3
    • +3
    /src/main/webapp/app/src/parameterModule/templates/SitelogDashboardParam.html
    • -3
    • +3
    /src/main/webapp/app/src/session/mainLayout/templates/siteLogDashboard.html
4:15 am

Aqueel Ahamad

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

Options
Thursday 10 Feb 2022
8:59 am

Raj Babu <raj_babu@genpt.com>

Merge branch 'PUL-8038' into 'develop'

Fix-PUL-8038:Bug: Slider: slider moves can create visual distortions in the graph

Closes PUL-8038

See merge request Pulse/PulseUI!601

Options
8:30 am

Tulasiram N

PUL-8038:Bug: Slider: slider moves can create visual distortions in the graph

Options
    • -1
    • +1
    /src/main/webapp/app/src/parameterModule/templates/parameter.singleSite.html
Wednesday 09 Feb 2022
9:18 am

Raj Babu <raj_babu@genpt.com>

Update application-uap-qa.properties PULSEUAP password change

Options
    • -1
    • +1
    /src/main/resources/application-uap-qa.properties
9:17 am

Raj Babu <raj_babu@genpt.com>

Update application-us-qa.properties - PULSEUI password Change

Options
    • -1
    • +1
    /src/main/resources/application-us-qa.properties
4:25 am

Aqueel Ahamad

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

 Conflicts:

 src/main/webapp/app/src/session/preferences/templates/preferenceReview.html

Options
Tuesday 08 Feb 2022
9:07 am

Raj Babu <raj_babu@genpt.com>

Merge branch 'PUL-8035' into 'develop'

FIX:PUL-8035 :Choosing "Session Preferences" fails to show selection made for "Do Not Update Min if..."

Closes PUL-8035

See merge request Pulse/PulseUI!599

Options
8:09 am

Tulasiram N

removed pulseui prefix in table names

Options
    • -15
    • +15
    /src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
7:41 am

Tulasiram N

PUL-8035 :Choosing "Session Preferences" fails to show selection made for "Do Not Update Min if..."

Options
    • -2
    • +3
    /src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
    • -0
    • +11
    /src/main/java/com/napa/pulse/dto/SessionDetailsDTO.java
    • -1
    • +9
    /src/main/webapp/app/src/session/preferences/sessionPreferenceCtrl.js
    • -0
    • +17
    /src/main/webapp/app/src/session/preferences/templates/preferenceReview.html
Monday 07 Feb 2022
1:54 pm

Raj Babu <raj_babu@genpt.com>

Merge branch 'PUL-8035' into 'develop'

fix - Choosing "Show All" fails to resolve

Closes PUL-8035

See merge request Pulse/PulseUI!598

Options
9:24 am

Rahul Chaudhary

fix - Choosing "Show All" fails to resolve

Options
    • -3
    • +2
    /src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
Friday 04 Feb 2022
8:45 am

Raj Babu <raj_babu@genpt.com>

Merge branch 'PUL-8034' into 'develop'

Resolve PUL-8034 - Site Logbook: Min Max Sessions: add the min max session info to XL export

Closes PUL-8034

See merge request Pulse/PulseUI!597

Options
8:32 am

Rahul Chaudhary

Fix - Session creation Failing

Options
    • -6
    • +8
    /src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
8:30 am

Rahul Chaudhary

Service Changes - For generating Excel of Site log book

Options
    • -3
    • +22
    /src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
    • -9
    • +27
    /src/main/java/com/napa/pulse/dao/impl/SiteLogbookDAOImpl.java
    • -1
    • +7
    /src/main/java/com/napa/pulse/dao/interfaces/SessionDAO.java
    • -1
    • +6
    /src/main/java/com/napa/pulse/service/impl/SessionServiceImpl.java
    • -0
    • +6
    /src/main/java/com/napa/pulse/service/interfaces/SessionService.java
8:27 am

Rahul Chaudhary

UI Change - For generating Excel of Site log book

Options
    • -210
    • +297
    /src/main/webapp/app/src/parameterModule/paramTreeCtrl.js
    • -1
    • +6
    /src/main/webapp/app/src/parameterModule/templates/SitelogDashboardParam.html
    • -66
    • +67
    /src/main/webapp/app/src/session/mainLayout/sessionMainLayoutCtrl.js
Thursday 03 Feb 2022
2:04 pm

Raj Babu <raj_babu@genpt.com>

Merge branch 'PUL-8042' into 'develop'

FIX : PUL-8042:Min Max: Add'l Settings: Remove "Subtract transfers from sales" option

Closes PUL-8042

See merge request Pulse/PulseUI!596

Options
11:19 am

Tulasiram N

PUL-8042:Min Max: Add'l Settings: Remove "Subtract transfers from sales" option

Options
    • -5
    • +6
    /src/main/webapp/app/src/session/mainLayout/sessionMainLayoutCtrl.js
    • -10
    • +10
    /src/main/webapp/app/src/session/preferences/sessionPreferenceCtrl.js