Merge branch 'MIFOSX-1809' of git://github.com/chandrikamohith/mifosx into chandrikamohith-MIFOSX-1809
This commit is contained in:
+1
@@ -22,6 +22,7 @@ public class GroupingTypesApiConstants {
|
|||||||
public static final String GROUP_ROLE_NAME = "GROUPROLE";
|
public static final String GROUP_ROLE_NAME = "GROUPROLE";
|
||||||
|
|
||||||
public static final String GROUP_CLOSURE_REASON = "GroupClosureReason";
|
public static final String GROUP_CLOSURE_REASON = "GroupClosureReason";
|
||||||
|
public static final String CENTER_CLOSURE_REASON = "CenterClosureReason";
|
||||||
|
|
||||||
public static final String roleParamName = "role";
|
public static final String roleParamName = "role";
|
||||||
public static final String groupIdParamName = "groupId";
|
public static final String groupIdParamName = "groupId";
|
||||||
|
|||||||
+1
-1
@@ -504,7 +504,7 @@ public class CenterReadPlatformServiceImpl implements CenterReadPlatformService
|
|||||||
@Override
|
@Override
|
||||||
public CenterData retrieveCenterWithClosureReasons() {
|
public CenterData retrieveCenterWithClosureReasons() {
|
||||||
final List<CodeValueData> closureReasons = new ArrayList<>(
|
final List<CodeValueData> closureReasons = new ArrayList<>(
|
||||||
this.codeValueReadPlatformService.retrieveCodeValuesByCode(GroupingTypesApiConstants.GROUP_CLOSURE_REASON));
|
this.codeValueReadPlatformService.retrieveCodeValuesByCode(GroupingTypesApiConstants.CENTER_CLOSURE_REASON));
|
||||||
return CenterData.withClosureReasons(closureReasons);
|
return CenterData.withClosureReasons(closureReasons);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -589,7 +589,7 @@ public class GroupingTypesWritePlatformServiceJpaRepositoryImpl implements Group
|
|||||||
final Long closureReasonId = command.longValueOfParameterNamed(GroupingTypesApiConstants.closureReasonIdParamName);
|
final Long closureReasonId = command.longValueOfParameterNamed(GroupingTypesApiConstants.closureReasonIdParamName);
|
||||||
|
|
||||||
final CodeValue closureReason = this.codeValueRepository.findOneByCodeNameAndIdWithNotFoundDetection(
|
final CodeValue closureReason = this.codeValueRepository.findOneByCodeNameAndIdWithNotFoundDetection(
|
||||||
GroupingTypesApiConstants.GROUP_CLOSURE_REASON, closureReasonId);
|
GroupingTypesApiConstants.CENTER_CLOSURE_REASON, closureReasonId);
|
||||||
|
|
||||||
final AppUser currentUser = this.context.authenticatedUser();
|
final AppUser currentUser = this.context.authenticatedUser();
|
||||||
|
|
||||||
|
|||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
INSERT INTO `m_code` (`code_name`,`is_system_defined`) VALUES('CenterClosureReason',1);
|
||||||
Reference in New Issue
Block a user