Skip to content

SB-21700 - Conflicts Resolve ( Release 4.3.0 Into Master ) #495

Open
manjudr wants to merge 667 commits intoSunbird-Ed:masterfrom
manjudr:conflicts-fixes
Open

SB-21700 - Conflicts Resolve ( Release 4.3.0 Into Master ) #495
manjudr wants to merge 667 commits intoSunbird-Ed:masterfrom
manjudr:conflicts-fixes

Conversation

@manjudr
Copy link
Copy Markdown
Collaborator

@manjudr manjudr commented Nov 30, 2021

StorySB-21700 Script for Teacher Training related Public Dashboard

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Type of change

Please choose appropriate options.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes in the below checkboxes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • Ran Test A
  • Ran Test B

Test Configuration:

  • Software versions:
  • Hardware versions:

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

ishawakankar and others added 30 commits June 23, 2021 16:51
Issue #SB-23540: Changes for fieldname
Changes for user_id metrics in report
Issue #SB-24872: Validate invalid batchId in data-exhaust job
TG-965: Code changes for loading batches with parallesim for user enrolment data
Issue SC-000: Fix the persist code issue
manjudr and others added 30 commits September 16, 2021 16:02
Issue #0000: VDN Reports Job Start Logs Added
Issue DIK-5812: Soucing Metrics Report Fix With Druid Stream Query Paramter
SB-24793  - Release 4.2.0 into Release-4.3.0
…64-release-4.1.0

SB-24793 - Merge reverted migration script changes into release-4.2.0
SB-26855: ETB Metrics fix for druid stream query paramter issue
Issue #TG-1089 fix: Remove On-demand druid exhaust jobs from this repo as it is moved to CoreDataProducts
SB-24793 - Conflict resolve - Merging release-4.2.1 into 4.3.0
DD-1717 : Generating duplicate requests count metric
…fixes

# Conflicts:
#	data-products/src/main/resources/data.cql
#	data-products/src/main/scala/org/sunbird/analytics/job/report/AssessmentCorrectionJob.scala
#	data-products/src/main/scala/org/sunbird/analytics/model/report/AssessmentCorrectionModel.scala
#	data-products/src/test/resources/application.conf
#	data-products/src/test/scala/org/sunbird/analytics/job/report/TestAssessmentCorrectionJob.scala
#	data-products/src/test/scala/org/sunbird/analytics/model/report/TestAssessmentCorrectionModel.scala
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.