PulseUI

Clone Tools
More
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Monday 06 Sep 2021
5:10 am

pctr766664 <pctr76666@genpt.net>

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

Options
    • -646
    • +653
    /src/main/webapp/app/src/_scss/parameter.scss
    • -193
    • +193
    /src/main/webapp/app/src/parameterModule/templates/parameter.singleSite.html
Friday 03 Sep 2021
10:11 am

Naveen Kumar

Resolve PUL-7710 and PUL-7828

Options
    • -40
    • +25
    /src/main/java/com/napa/pulse/controller/rest/HubSpokeNetworkController.java
    • -1
    • +1
    /src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
    • -1
    • +1
    /src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js
    • -2
    • +2
    /src/main/webapp/app/src/session/marketSelection/templates/newHubSpokeView.html
10:11 am

Raj Babu <raj_babu@genpt.com>

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

Options
8:59 am

Naveen Kumar

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

Options
    • -40
    • +25
    /src/main/java/com/napa/pulse/controller/rest/HubSpokeNetworkController.java
    • -1
    • +1
    /src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
    • -1
    • +1
    /src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js
    • -2
    • +2
    /src/main/webapp/app/src/session/marketSelection/templates/newHubSpokeView.html
8:56 am

Naveen Kumar

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

Options
Thursday 02 Sep 2021
10:12 am

Raj Babu <raj_babu@genpt.com>

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

Options
10:12 am

Naveen Kumar

Resolve PUL-7710 and PUL-7872

Options
    • -2
    • +2
    /src/main/java/com/napa/pulse/controller/rest/HubSpokeNetworkController.java
    • -16
    • +16
    /src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
    • -1
    • +1
    /src/main/java/com/napa/pulse/dao/interfaces/HubSpokeNetworkDAO.java
    • -16
    • +32
    /src/main/java/com/napa/pulse/service/impl/HubSpokeNetworkServiceImpl.java
    • -1
    • +1
    /src/main/java/com/napa/pulse/service/interfaces/HubSpokeNetworkService.java
    • -291
    • +243
    /src/main/webapp/app/src/productComponent/productList.html
    • -2
    • +2
    /src/main/webapp/app/src/repositories/hubSpokeRepo.js
    • -3
    • +31
    /src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js
    • -103
    • +120
    /src/main/webapp/app/src/session/marketSelection/templates/newHubSpokeView.html
9:37 am

Naveen Kumar

PUL-7710-"Query Changes"

Options
    • -2
    • +2
    /src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
8:48 am

Naveen Kumar

PUL-7710-"Merge Conflict"

Options
    • -1
    • +1
    /src/main/webapp/app/src/session/marketSelection/templates/newHubSpokeView.html
8:47 am

Naveen Kumar

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

 Conflicts:

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

Options
    • -1
    • +30
    /src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js
8:41 am

Naveen Kumar

PUL-7710-"Changes For Export Excel"

Options
    • -2
    • +2
    /src/main/java/com/napa/pulse/controller/rest/HubSpokeNetworkController.java
    • -16
    • +16
    /src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
    • -1
    • +1
    /src/main/java/com/napa/pulse/dao/interfaces/HubSpokeNetworkDAO.java
    • -16
    • +32
    /src/main/java/com/napa/pulse/service/impl/HubSpokeNetworkServiceImpl.java
    • -1
    • +1
    /src/main/java/com/napa/pulse/service/interfaces/HubSpokeNetworkService.java
    • -2
    • +2
    /src/main/webapp/app/src/repositories/hubSpokeRepo.js
    • -2
    • +1
    /src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js
    • -2
    • +1
    /src/main/webapp/app/src/session/marketSelection/templates/newHubSpokeView.html
6:45 am

Rahul Chaudhary

Product page fix

Options
    • -291
    • +243
    /src/main/webapp/app/src/productComponent/productList.html
    • -1
    • +9
    /src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js
6:36 am

Rahul Chaudhary

Redesign hub-spoke dashboard

Options
    • -2
    • +23
    /src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js
    • -157
    • +99
    /src/main/webapp/app/src/session/marketSelection/templates/newHubSpokeView.html
5:51 am

Akash Venkatesan <Akash_Venkatesan@genpt.com>

PUL-7828 - Hub Spoke Dashboard redesign changes

Options
    • -28
    • +103
    /src/main/webapp/app/src/session/marketSelection/templates/newHubSpokeView.html
5:43 am

Akash Venkatesan <Akash_Venkatesan@genpt.com>

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

Options
Wednesday 01 Sep 2021
10:41 am

Raj Babu <raj_babu@genpt.com>

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

Options
10:41 am

Rahul Chaudhary

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

Options
    • -18
    • +40
    /src/main/java/com/napa/pulse/controller/rest/HubSpokeNetworkController.java
    • -322
    • +439
    /src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
    • -7
    • +10
    /src/main/java/com/napa/pulse/dao/interfaces/HubSpokeNetworkDAO.java
    • -3
    • +1
    /src/main/java/com/napa/pulse/dto/HubSpokeCreateRequestDto.java
    • -42
    • +20
    /src/main/java/com/napa/pulse/dto/HubSpokeNetworkDTO.java
    • -5
    • +3
    /src/main/java/com/napa/pulse/dto/ProductHubDTO.java
    • -0
    • +36
    /src/main/java/com/napa/pulse/dto/ProductMapDto.java
    • -0
    • +31
    /src/main/java/com/napa/pulse/dto/SpokeSiteDto.java
    • -17
    • +33
    /src/main/java/com/napa/pulse/service/impl/HubSpokeNetworkServiceImpl.java
    • -7
    • +10
    /src/main/java/com/napa/pulse/service/interfaces/HubSpokeNetworkService.java
    • -0
    • +20
    /src/main/webapp/app/src/_scss/pulse.scss
    • -29
    • +59
    /src/main/webapp/app/src/repositories/hubSpokeRepo.js
    • -176
    • +369
    /src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js
    • -64
    • +163
    /src/main/webapp/app/src/session/marketSelection/templates/newHubSpokeView.html
    • -35
    • +75
    /src/main/webapp/app/src/session/marketSelection/templates/siteProductSelectionDialog.html
    • -38
    • +11
    /src/main/webapp/app/src/session/marketSelection/templates/siteSelectionDialog.html
8:35 am

Naveen Kumar

Resolve PUL-7849

Options
    • -100
    • +142
    /src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
8:35 am

Naveen Kumar

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

Resolve PUL-7849

See merge request Pulse/PulseUI!489

Options
8:32 am

Naveen Kumar

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

Options
    • -6
    • +14
    /src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
8:27 am

Rahul Chaudhary

Conflict resolved

Options
    • -5
    • +1
    /src/main/java/com/napa/pulse/controller/rest/HubSpokeNetworkController.java
    • -17
    • +1
    /src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
    • -1
    • +0
    /src/main/java/com/napa/pulse/dao/interfaces/HubSpokeNetworkDAO.java
    • -4
    • +0
    /src/main/java/com/napa/pulse/service/impl/HubSpokeNetworkServiceImpl.java
    • -1
    • +0
    /src/main/java/com/napa/pulse/service/interfaces/HubSpokeNetworkService.java
Tuesday 31 Aug 2021
10:53 am

Rahul Chaudhary

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

Options
    • -0
    • +5
    /src/main/java/com/napa/pulse/controller/rest/HubSpokeNetworkController.java
    • -0
    • +17
    /src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
    • -0
    • +2
    /src/main/java/com/napa/pulse/dao/interfaces/HubSpokeNetworkDAO.java
    • -0
    • +4
    /src/main/java/com/napa/pulse/service/impl/HubSpokeNetworkServiceImpl.java
    • -0
    • +1
    /src/main/java/com/napa/pulse/service/interfaces/HubSpokeNetworkService.java
10:44 am

Rahul Chaudhary

Vendor Filter UI - Change

Options
    • -2
    • +7
    /src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
    • -1
    • +1
    /src/main/webapp/app/src/_scss/pulse.scss
    • -1
    • +6
    /src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js
    • -39
    • +35
    /src/main/webapp/app/src/session/marketSelection/templates/siteProductSelectionDialog.html
10:25 am

Raj Babu <raj_babu@genpt.com>

Merge branch 'PUL-7799' into 'develop'

Resolve PUL-7799

Closes PUL-7799

See merge request Pulse/PulseUI!488

Options
9:33 am

pctr766664 <pctr76666@genpt.net>

inclusion for Spoke sites/products

Options
    • -1
    • +0
    /src/main/java/com/napa/pulse/controller/rest/SystemRestController.java
    • -2
    • +0
    /src/main/webapp/app/src/session/nicheStocking/systemAssignmentCtrl.js
9:25 am

pctr766664 <pctr76666@genpt.net>

inclusion for Spoke sites/products

Options
    • -0
    • +5
    /src/main/java/com/napa/pulse/controller/rest/HubSpokeNetworkController.java
    • -0
    • +7
    /src/main/java/com/napa/pulse/controller/rest/SystemRestController.java
    • -0
    • +17
    /src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
    • -0
    • +11
    /src/main/java/com/napa/pulse/dao/impl/SystemDAOImpl.java
    • -0
    • +2
    /src/main/java/com/napa/pulse/dao/interfaces/HubSpokeNetworkDAO.java
    • -0
    • +1
    /src/main/java/com/napa/pulse/dao/interfaces/SystemDAO.java
    • -0
    • +4
    /src/main/java/com/napa/pulse/service/impl/HubSpokeNetworkServiceImpl.java
    • -3
    • +14
    /src/main/java/com/napa/pulse/service/impl/SystemServiceImpl.java
    • -0
    • +1
    /src/main/java/com/napa/pulse/service/interfaces/HubSpokeNetworkService.java
    • -0
    • +1
    /src/main/java/com/napa/pulse/service/interfaces/SystemService.java
    • -59
    • +78
    /src/main/webapp/app/src/repositories/systemRepo.js
    • -185
    • +202
    /src/main/webapp/app/src/session/nicheStocking/sessionNicheStockingCtrl.js
    • -226
    • +228
    /src/main/webapp/app/src/session/nicheStocking/systemAssignmentCtrl.js
    • -72
    • +147
    /src/main/webapp/app/src/session/nicheStocking/templates/systemAssignmentView.html
7:06 am

Rahul Chaudhary

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

Options
7:05 am

Rahul Chaudhary

Vendor Filter UI - Change

Options
    • -0
    • +8
    /src/main/webapp/app/src/_scss/pulse.scss
    • -15
    • +25
    /src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js
    • -64
    • +66
    /src/main/webapp/app/src/session/marketSelection/templates/siteProductSelectionDialog.html
Friday 27 Aug 2021
3:54 pm

Raj Babu <raj_babu@genpt.com>

Merge branch 'PUL-7861' into 'develop'

PUL-7861 - Hub Spoke: Hide "Sell Down" UI elements

See merge request Pulse/PulseUI!487

Options
1:40 pm

Shoban Sriram

Merge branch 'PUL-7855' into 'develop'

PUL-7855_Keep Qty Applied to Non-Return SKUs

Closes PUL-7855

See merge request Pulse/PulseUI!486

Options