PulseUI

Clone Tools
More
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Monday 06 Jun 2022
11:55 am

John Brady <458685@ayrnjk27vjw.genpt.net>

Pushing fixes for some errors.

Options
    • -2
    • +2
    /src/main/java/com/napa/pulse/controller/rest/SessionRestController.java
    • -6
    • +8
    /src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
    • -1
    • +0
    /src/main/java/com/napa/pulse/dto/SessionPreferencesDTO.java
    • -2
    • +4
    /src/main/java/com/napa/pulse/service/impl/SessionServiceImpl.java
    • -2
    • +4
    /src/main/java/com/napa/pulse/service/interfaces/SessionService.java
10:09 am

Raj Babu <raj_babu@genpt.com>

Merge branch 'PUL-8202' into 'develop'

Resolve PUL-8202

Closes PUL-8202

See merge request Pulse/PulseUI!692

Options
8:39 am

Anil Sunkoju

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

Options
8:33 am

Raj Babu <raj_babu@genpt.com>

Merge branch 'PUL-conflict' into 'develop'

Pul conflict

See merge request Pulse/PulseUI!691

Options
8:15 am

Tulasiram N

fix conflicts due to pul -8173

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

Anil Sunkoju

Prolink column featur flag enabled conflict resolved

Options
    • -0
    • +9
    /src/main/webapp/app/src/session/sessionPreferenceSettingService.js
7:19 am

Anil Sunkoju

PUL-8117 conflict resolved

Options
    • -7
    • +12
    /src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java
    • -2
    • +3
    /src/main/java/com/napa/pulse/service/impl/ExportServiceImpl.java
6:41 am

Anil Sunkoju

PUL-8217 conflict resolve

Options
    • -1
    • +1
    /src/main/java/com/napa/pulse/controller/rest/HubSpokeNetworkController.java
    • -2
    • +2
    /src/main/webapp/app/src/repositories/hubSpokeRepo.js
    • -1
    • +1
    /src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js
6:24 am

Anil Sunkoju

Fixed: PUL-8202-"F" Key: Review pages: invokes and submits the filter.

Options
    • -0
    • +7
    /src/main/webapp/app/src/session/review/sessionReviewCtrl.js
    • -8
    • +8
    /src/main/webapp/app/src/session/review/templates/sessionReviewFilterPanel.html
Friday 03 Jun 2022
10:14 am

Raj Babu <raj_babu@genpt.com>

Merge branch 'PUL-8288' into 'develop'

Resolve PUL-8288

Closes PUL-8288

See merge request Pulse/PulseUI!690

Options
10:10 am

Rahul Chaudhary

Adding Feature Flag to DC Net Sales: XL Export query

Options
    • -3
    • +3
    /src/main/java/com/napa/pulse/service/impl/ExportServiceImpl.java
10:05 am

Rahul Chaudhary

Adding Feature Flag to DC Net Sales: Adv Filter and XL Export

Options
    • -3
    • +3
    /src/main/java/com/napa/pulse/service/impl/ExportServiceImpl.java
    • -1
    • +1
    /src/main/webapp/app/src/session/review/sessionReviewCtrl.js
9:58 am

Raj Babu <raj_babu@genpt.com>

Merge branch 'PUL-8173' into 'develop'

PUL-8173 Xl export query fix

Closes PUL-8173

See merge request Pulse/PulseUI!689

Options
8:31 am

Tulasiram N

PUL-8173 Xl export query fix

Options
    • -11
    • +37
    /src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java
    • -2
    • +28
    /src/main/java/com/napa/pulse/service/impl/ExportServiceImpl.java
Wednesday 01 Jun 2022
12:30 pm

Raj Babu <raj_babu@genpt.com>

Merge branch 'pUL-8155' into 'develop'

PUL-8227

See merge request Pulse/PulseUI!688

Options
12:23 pm

Tulasiram N

Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into pUL-8155

Options
12:23 pm

Tulasiram N

change of close lable to close(No Entry)

Options
    • -1
    • +1
    /src/main/webapp/app/src/session/finalize/templates/logbookEntryForm.html
11:30 am

Raj Babu <raj_babu@genpt.com>

Merge branch 'pUL-8155' into 'develop'

PUL-8227 :Fix:-Site Logbook Finalization issue

See merge request Pulse/PulseUI!687

Options
11:26 am

Tulasiram N

Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into pUL-8155

Options
    • -5
    • +9
    /src/main/webapp/app/src/_scss/pulse.scss
11:14 am

Tulasiram N

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

Options
11:07 am

Raj Babu <raj_babu@genpt.com>

Merge branch 'PUL-8173' into 'develop'

Resolve PUL-8173

Closes PUL-8173

See merge request Pulse/PulseUI!686

Options
10:41 am

Tulasiram N

PUL-8173 adv. filter

Options
    • -2
    • +2
    /src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java
10:08 am

Tulasiram N

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

This reverts commit 7b130e896e328e9de41abb0d31ec40d0cd3007f5

Options
    • -1
    • +1
    /src/main/java/com/napa/pulse/controller/rest/HubSpokeNetworkController.java
    • -12
    • +7
    /src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java
    • -3
    • +2
    /src/main/java/com/napa/pulse/service/impl/ExportServiceImpl.java
    • -2
    • +2
    /src/main/webapp/app/src/repositories/hubSpokeRepo.js
    • -1
    • +1
    /src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js
    • -281
    • +313
    /src/main/webapp/app/src/session/review/sessionReviewCtrl.js
    • -8
    • +8
    /src/main/webapp/app/src/session/review/templates/sessionReviewFilterPanel.html
    • -9
    • +0
    /src/main/webapp/app/src/session/sessionPreferenceSettingService.js
9:20 am

Tulasiram N

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

 Conflicts:

 src/main/webapp/app/src/session/review/sessionReviewCtrl.js

Options
    • -7
    • +12
    /src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java
    • -2
    • +3
    /src/main/java/com/napa/pulse/service/impl/ExportServiceImpl.java
    • -8
    • +8
    /src/main/webapp/app/src/session/review/templates/sessionReviewFilterPanel.html
9:18 am

Tulasiram N

PUL-8173 service changes for adv filter,bulk edit and xl export

Options
    • -0
    • +12
    /src/main/java/com/napa/pulse/controller/rest/ReviewRestController.java
    • -26
    • +53
    /src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java
5:58 am

Rahul Chaudhary

commiting tests

Options
    • -0
    • +6
    /src/main/webapp/app/src/.prettierrc
    • -66
    • +0
    /src/test/com/napa/pulse/dao/impl/SessionDAOImplUnitTest.java
    • -0
    • +106
    /src/test/java/com/napa/pulse/dao/impl/ReviewDAOImplUnitTest.java
    • -0
    • +67
    /src/test/java/com/napa/pulse/dao/impl/SessionDAOImplUnitTest.java
Tuesday 31 May 2022
8:14 am

Tulasiram N

PUL-8155 Prod bug fix

Options
    • -5
    • +5
    /src/main/webapp/app/src/_scss/pulse.scss
    • -4
    • +3
    /src/main/webapp/app/src/session/finalize/templates/logbookEntryForm.html
Friday 27 May 2022
12:10 pm

John Brady <458685@ayrnjk27vjw.genpt.net>

Pushing initial commit.

Options
    • -1
    • +6
    /src/main/java/com/napa/pulse/controller/rest/SessionRestController.java
    • -8
    • +16
    /src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
    • -1
    • +2
    /src/main/java/com/napa/pulse/dao/interfaces/SessionDAO.java
    • -0
    • +8
    /src/main/java/com/napa/pulse/dto/SessionPreferencesDTO.java
    • -2
    • +2
    /src/main/java/com/napa/pulse/service/impl/SessionServiceImpl.java
    • -1
    • +1
    /src/main/java/com/napa/pulse/service/interfaces/SessionService.java
    • -0
    • +1
    /src/main/webapp/app/src/repositories/sessionRepo.js
    • -1
    • +11
    /src/main/webapp/app/src/session/preferences/sessionPreferenceCtrl.js
9:36 am

Tulasiram N

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

Options
7:36 am

Rahul Chaudhary

Pulling latest from develop and resolved conflict

Options
    • -1
    • +0
    /src/main/java/com/napa/pulse/dto/SKUTableWidgetData.java