Skip to content

Commit

Permalink
4.8.14 dev v9 (#594)
Browse files Browse the repository at this point in the history
* 4.8.14 dev v9 (#589)

* 4.8.15 dev v1 (#584)

* KB-4705 | DEV| Assessment | BE | Consumption Logic for the QuestionWeightage Assessment Type (#564)

* Added string handling in admin patch API

* Assessment V5 Changes

Assessment V5 Changes

* KB-4705 | DEV| Assessment | BE | Consumption Logic for the QuestionWeightage Assessment Type

1. Removed the hardcoded attributes and added from assessment hierarchy.

* KB-4705 | DEV| Assessment | BE | Consumption Logic for the QuestionWeightage Assessment Type

1. Added proper comments and logs.
2. Refractored the code.
3. Added logic for optionweightage.

---------

Co-authored-by: karthik-tarento <karthikeyan.rajendran@tarento.com>

* Retry Attempts Enabled for Assessment V5

* KB-4705 | DEV| Assessment | BE | Consumption Logic for the QuestionWeightage Assessment Type (#565)

1. Optional weightage score calculation enhancements.

* Adding the insight API implementation for MDO channel (#571)

* SaveStateMethod

* Maintaining the order of the fields.

* KB-4705 | DEV| Assessment | BE | Consumption Logic for the QuestionWeightage Assessment Type (#580)

1. Enhanchements for questionScheme.

* KB-5130 | DEV| Assessment | BE | Enhancement in Consumption Logic for the QuestionWeightage Assessment Type. (#581)

1. Added logic for new attributes added.
2. Added questionLevel param in Question read API.

* KB-5130 | DEV| Assessment | BE | Enhancement in Consumption Logic for the QuestionWeightage Assessment Type. (#583)

1. Score calculation fix.

---------

Co-authored-by: tarentomaheshvakkund <139739142+tarentomaheshvakkund@users.noreply.github.com>
Co-authored-by: karthik-tarento <karthikeyan.rajendran@tarento.com>
Co-authored-by: saipradeep_ravipati <saipradeep.ravipati@tarento.com>

* KB-4754:Validation for language, designation fix

* removed changes from cbrelaease-4.8.15

* Modified error message on date of birth validation failure

* changed approach for fetchind and storing data from redis

---------

Co-authored-by: Sahil-tarento <140611066+Sahil-tarento@users.noreply.github.com>
Co-authored-by: tarentomaheshvakkund <139739142+tarentomaheshvakkund@users.noreply.github.com>
Co-authored-by: karthik-tarento <karthikeyan.rajendran@tarento.com>
Co-authored-by: saipradeep_ravipati <saipradeep.ravipati@tarento.com>

* KB-4754 changed regex for employee Id to allow all alphabets, updated error message for employee Id containing spaces.

---------

Co-authored-by: Sahil-tarento <140611066+Sahil-tarento@users.noreply.github.com>
Co-authored-by: tarentomaheshvakkund <139739142+tarentomaheshvakkund@users.noreply.github.com>
Co-authored-by: karthik-tarento <karthikeyan.rajendran@tarento.com>
Co-authored-by: saipradeep_ravipati <saipradeep.ravipati@tarento.com>
  • Loading branch information
5 people authored Jun 12, 2024
1 parent fa63744 commit 2a40e50
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion src/main/java/org/sunbird/common/util/ProjectUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ public static Boolean validateDate(String dateString){
}

public static Boolean validateEmployeeId(String employeeId) {
return employeeId.matches("^(?=.*\\d|[a-zA-Z]{30})[a-zA-Z0-9 .-]{1,30}$"); // Allow only alphanumeric, numeric and restrict if only alphabets character
return employeeId.matches("^[a-zA-Z0-9]{1,30}$"); // Allow only alphanumeric,numeric and alphabetic.
}

public static Boolean validateRegexPatternWithNoSpecialCharacter(String regex) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.sunbird.cache.RedisCacheMgr;
import org.sunbird.cassandra.utils.CassandraOperation;
import org.sunbird.common.model.SBApiResponse;
import org.sunbird.common.util.CbExtServerProperties;
Expand Down

0 comments on commit 2a40e50

Please sign in to comment.