PulseUI

Clone Tools
More
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Friday 17 Apr 2020
11:56 am

Matthew Giannelli <Matthew_Giannelli@genpt.com>

[PUL-7051] Added feature flag

Options
    • -1
    • +1
    /src/main/webapp/app/src/pulseModule/navBar/navBar.html
    • -0
    • +2
    /src/main/webapp/app/src/shared/directives/genericDialog.js
    • -1
    • +1
    /src/main/webapp/app/src/shared/templates/genericDialog.html
11:27 am

Matthew Giannelli <matthew_giannelli@genpt.com>

Merge branch 'PUL-7108_ORANGE_BARS' into 'develop'

Resolve PUL-7108 "Orange bars"

Closes PUL-7108

See merge request Pulse/PulseUI!164

Options
11:13 am

Yong Wang <yongwang.ai@gmail.com>

[PUL-7108] remove nodeIds param -fix

Options
    • -4
    • +3
    /src/main/webapp/app/src/apis/dashboardPageApi.js
    • -26
    • +25
    /src/main/webapp/app/src/session/dashboard/sessionAcoDashboardCtrl.js
9:24 am

David Hannan <david_hannan@genpt.com>

Merge branch 'develop' into 'PUL-7108_ORANGE_BARS'

# Conflicts:

# src/main/webapp/app/src/apis/dashboardPageApi.js

Options
    • -17
    • +58
    /src/main/java/com/napa/pulse/controller/rest/AcoRestController.java
    • -7
    • +7
    /src/main/java/com/napa/pulse/dao/impl/AcoDAOImpl.java
    • -0
    • +1
    /src/main/java/com/napa/pulse/dao/interfaces/AcoDAO.java
    • -4
    • +13
    /src/main/java/com/napa/pulse/service/impl/AcoServiceImpl.java
    • -0
    • +1
    /src/main/java/com/napa/pulse/service/interfaces/AcoService.java
    • -3
    • +5
    /src/main/webapp/app/src/apis/dashboardPageApi.js
Thursday 16 Apr 2020
3:55 pm

Matthew Giannelli <matthew_giannelli@genpt.com>

Merge branch 'bug/PUL-7090_Debug_text' into 'develop'

[PUL-7090] - Removed DEBUG text from UI.

Closes PUL-7090

See merge request Pulse/PulseUI!163

Options
3:53 pm

Matthew Giannelli <Matthew_Giannelli@genpt.com>

[PUL-7051] Fixed overlay issue when flattening the image

Options
    • -14
    • +28
    /src/main/webapp/app/src/userFeedback/userFeedbackCtrl.js
11:52 am

Yong Wang <yongwang.ai@gmail.com>

[PUL-7108] remove nodeIds param

Options
    • -6
    • +7
    /src/main/webapp/app/src/apis/dashboardPageApi.js
11:33 am

Eliott NIcholson <eliottnicholson@gmail.com>

[PUL-7090] - Removed DEBUG text from UI.

Options
    • -1
    • +1
    /src/main/webapp/app/src/admin/siteMaintenance/templates/siteCopy.html
10:21 am

David Hannan <david_hannan@genpt.com>

PUL-7108 ACO Orange Bars amounts not aligned w/ ACO

Options
    • -15
    • +2
    /src/main/java/com/napa/pulse/controller/rest/AcoRestController.java
    • -3
    • +1
    /src/main/java/com/napa/pulse/dao/impl/AcoDAOImpl.java
    • -19
    • +26
    /src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
    • -1
    • +1
    /src/main/java/com/napa/pulse/dao/interfaces/AcoDAO.java
    • -2
    • +2
    /src/main/java/com/napa/pulse/service/impl/AcoServiceImpl.java
    • -1
    • +1
    /src/main/java/com/napa/pulse/service/interfaces/AcoService.java
9:57 am

Matthew Giannelli <Matthew_Giannelli@genpt.com>

Merge branch 'develop' into feature/PUL-7051-feedback-button

Options
Wednesday 15 Apr 2020
3:09 pm

Matthew Giannelli <Matthew_Giannelli@genpt.com>

[PUL-7051] Load user feedback email distro from database

Options
    • -3
    • +1
    /src/main/java/com/napa/pulse/email/EmailWSSvc.java
    • -9
    • +8
    /src/main/java/com/napa/pulse/service/impl/UserFeedbackServiceImpl.java
    • -3
    • +0
    /src/main/resources/application-dev.properties
    • -3
    • +0
    /src/main/resources/application-dr.properties
    • -3
    • +0
    /src/main/resources/application-prod.properties
    • -3
    • +0
    /src/main/resources/application-qa.properties
2:35 pm

Matthew Giannelli <Matthew_Giannelli@genpt.com>

[PUL-7051] Translate user feedback placeholder text

Options
    • -1
    • +9
    /src/main/webapp/app/src/userFeedback/userFeedbackCtrl.js
    • -1
    • +1
    /src/main/webapp/app/src/userFeedback/userFeedbackDialog.html
1:57 pm

Yong Wang <yongwang.ai@gmail.com>

[PUL-7100] ACO: Multi-category sessions: Dashboard page: remove log

Options
    • -2
    • +0
    /src/main/webapp/app/src/apis/dashboardPageApi.js
1:52 pm

Yong Wang <yongwang.ai@gmail.com>

[PUL-7100] ACO: Multi-category sessions: Dashboard page: Display order of the categories should be alphabetic

Options
    • -1
    • +12
    /src/main/webapp/app/src/apis/dashboardPageApi.js
12:18 pm

Matthew Giannelli <Matthew_Giannelli@genpt.com>

[PUL-7051] Delete screenshot file after sending email, added logging and comments

Options
    • -1
    • +1
    /src/main/java/com/napa/pulse/email/EmailWSSvc.java
    • -0
    • +11
    /src/main/java/com/napa/pulse/service/impl/UserFeedbackServiceImpl.java
10:06 am

Matthew Giannelli <Matthew_Giannelli@genpt.com>

[PUL-7051] Feedback button closes Session Finalize dialog before taking screenshot

Options
    • -0
    • +1
    /src/main/webapp/app/src/shared/directives/genericDialog.js
9:32 am

Jenkins <noreply@jenkins>

Update version(s) - API: 2.0.9.0 | Web: 2.9.0

Options
    • -1
    • +1
    /pom.xml
    • -1
    • +1
    /src/main/webapp/app/package-lock.json
    • -1
    • +1
    /src/main/webapp/app/package.json
9:28 am

Jenkins <noreply@jenkins>

Merge remote-tracking branch 'origin/develop'

Options
8:55 am

Eliott Nicholson <eliott_nicholson@genpt.com>

Merge branch 'PUL-7041' into 'develop'

Resolve PUL-7041

Closes PUL-7041

See merge request Pulse/PulseUI!152

Options
    • -7
    • +7
    /src/main/java/com/napa/pulse/dao/impl/AcoDAOImpl.java
8:55 am

David Hannan <david_hannan@genpt.com>

Resolve PUL-7041

Options
    • -17
    • +58
    /src/main/java/com/napa/pulse/controller/rest/AcoRestController.java
    • -7
    • +7
    /src/main/java/com/napa/pulse/dao/impl/AcoDAOImpl.java
    • -0
    • +1
    /src/main/java/com/napa/pulse/dao/interfaces/AcoDAO.java
    • -4
    • +13
    /src/main/java/com/napa/pulse/service/impl/AcoServiceImpl.java
    • -0
    • +1
    /src/main/java/com/napa/pulse/service/interfaces/AcoService.java
    • -9
    • +12
    /src/main/webapp/app/src/apis/dashboardPageApi.js
    • -24
    • +75
    /src/main/webapp/app/src/session/dashboard/sessionAcoDashboardCtrl.js
    • -1
    • +37
    /src/main/webapp/app/src/session/dashboard/templates/sessionAcoDashboardView.html
Tuesday 14 Apr 2020
6:26 pm

Matthew Giannelli <Matthew_Giannelli@genpt.com>

[PUL-7051] Added feedback button to Session Finalize dialog

Options
    • -1
    • +2
    /src/main/webapp/app/src/session/finalize/sessionFinalizeCtrl.js
    • -0
    • +5
    /src/main/webapp/app/src/shared/directives/genericDialog.js
    • -0
    • +2
    /src/main/webapp/app/src/shared/services/simpleModalDialog.js
    • -0
    • +8
    /src/main/webapp/app/src/shared/templates/genericDialog.html
1:54 pm

Matthew Giannelli <Matthew_Giannelli@genpt.com>

[PUL-7051] Refactor feedback type text into an entity

Options
    • -3
    • +15
    /src/main/java/com/napa/pulse/controller/rest/UserFeedbackRestController.java
    • -3
    • +5
    /src/main/java/com/napa/pulse/entity/pulseui/UserFeedback.java
    • -0
    • +42
    /src/main/java/com/napa/pulse/entity/pulseui/UserFeedbackType.java
    • -0
    • +8
    /src/main/java/com/napa/pulse/repository/UserFeedbackTypeRepository.java
    • -9
    • +2
    /src/main/java/com/napa/pulse/service/impl/UserFeedbackServiceImpl.java
    • -2
    • +2
    /src/main/webapp/app/src/apis/generalApi.js
    • -3
    • +3
    /src/main/webapp/app/src/pulseApp.js
    • -2
    • +2
    /src/main/webapp/app/src/userFeedback/userFeedbackCtrl.js
1:52 pm

Matthew Giannelli <Matthew_Giannelli@genpt.com>

[PUL-7051] Fixed ID type in UserFeedbackRepository

Options
    • -1
    • +1
    /src/main/java/com/napa/pulse/repository/UserFeedbackRepository.java
11:00 am

David Hannan <david_hannan@genpt.com>

Merge branch 'PUL-7110' into 'develop'

PUL-7110 Divide by zero error

Closes PUL-7110

See merge request Pulse/PulseUI!160

Options
10:50 am

David Hannan <david_hannan@genpt.com>

PUL-7110 Divide by zero error

Options
    • -4
    • +6
    /src/main/java/com/napa/pulse/dao/impl/AcoDAOImpl.java
    • -3
    • +5
    /src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
10:05 am

Matthew Giannelli <Matthew_Giannelli@genpt.com>

[PUL-7051] Updated to unique sequence generator ID

Options
    • -2
    • +2
    /src/main/java/com/napa/pulse/entity/pulseui/UserFeedback.java
10:04 am

Matthew Giannelli <Matthew_Giannelli@genpt.com>

Merge branch 'develop' into feature/PUL-7051-feedback-button

Options
9:07 am

Yong Wang <yong_wang@genpt.com>

Resolve PUL-7061 "Keyline setup link"

Options
    • -73
    • +85
    /src/main/webapp/app/src/session/preferences/sessionPreferenceCtrl.js
    • -120
    • +167
    /src/main/webapp/app/src/session/preferences/templates/preferenceView.html
9:07 am

Matthew Giannelli <matthew_giannelli@genpt.com>

Merge branch 'PUL-7061-keyline-setup-link' into 'develop'

Resolve PUL-7061 "Keyline setup link"

Closes PUL-7061

See merge request Pulse/PulseUI!159

Options
Monday 13 Apr 2020
4:21 pm

Matthew Giannelli <Matthew_Giannelli@genpt.com>

[PUL-7051] Used Thymeleaf to create a feedback email template

Options
    • -2
    • +5
    /src/main/java/com/napa/pulse/controller/rest/UserFeedbackRestController.java
    • -5
    • +9
    /src/main/java/com/napa/pulse/entity/pulseui/UserFeedback.java
    • -3
    • +30
    /src/main/java/com/napa/pulse/service/impl/UserFeedbackServiceImpl.java
    • -0
    • +50
    /src/main/resources/templates/userFeedback.html