rez_core 5.0.241 → 5.0.245
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/module/meta/controller/media.controller.d.ts +1 -4
- package/dist/module/meta/controller/media.controller.js +1 -1
- package/dist/module/meta/controller/media.controller.js.map +1 -1
- package/dist/module/meta/service/media-data.service.d.ts +1 -1
- package/dist/module/meta/service/media-data.service.js +2 -3
- package/dist/module/meta/service/media-data.service.js.map +1 -1
- package/dist/module/meta/service/resolver.service.js +4 -2
- package/dist/module/meta/service/resolver.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/meta/controller/media.controller.ts +2 -7
- package/src/module/meta/service/media-data.service.ts +2 -8
- package/src/module/meta/service/resolver.service.ts +11 -3
- package/.idea/250218_ether_core.iml +0 -12
- package/.idea/codeStyles/Project.xml +0 -59
- package/.idea/codeStyles/codeStyleConfig.xml +0 -5
- package/.idea/modules.xml +0 -8
- package/.idea/vcs.xml +0 -6
package/package.json
CHANGED
|
@@ -136,11 +136,7 @@ export class MediaController {
|
|
|
136
136
|
@Post('update/review-status/:id')
|
|
137
137
|
async updateMediaReviewStatus(
|
|
138
138
|
@Param('id') id: number,
|
|
139
|
-
@Body()
|
|
140
|
-
body: {
|
|
141
|
-
review_status: string;
|
|
142
|
-
remark: string;
|
|
143
|
-
},
|
|
139
|
+
@Body() body: any,
|
|
144
140
|
@Req() req: Request & { user: any },
|
|
145
141
|
@Res() res: Response,
|
|
146
142
|
) {
|
|
@@ -148,8 +144,7 @@ export class MediaController {
|
|
|
148
144
|
try {
|
|
149
145
|
const result = await this.mediaDataService.updateMediaReviewStatus(
|
|
150
146
|
id,
|
|
151
|
-
body
|
|
152
|
-
body.remark,
|
|
147
|
+
body,
|
|
153
148
|
loggedInUser,
|
|
154
149
|
);
|
|
155
150
|
res.status(HttpStatus.OK).json({
|
|
@@ -590,18 +590,12 @@ export class MediaDataService extends EntityServiceImpl {
|
|
|
590
590
|
);
|
|
591
591
|
}
|
|
592
592
|
|
|
593
|
-
async updateMediaReviewStatus(
|
|
594
|
-
id: number,
|
|
595
|
-
review_status: string,
|
|
596
|
-
remark: string,
|
|
597
|
-
loggedInUser,
|
|
598
|
-
) {
|
|
593
|
+
async updateMediaReviewStatus(id: number, entityData: any, loggedInUser) {
|
|
599
594
|
await super.updateEntity(
|
|
600
595
|
{
|
|
601
596
|
id,
|
|
602
597
|
entity_type: 'MDA',
|
|
603
|
-
|
|
604
|
-
remark,
|
|
598
|
+
review_info: entityData,
|
|
605
599
|
} as any,
|
|
606
600
|
loggedInUser,
|
|
607
601
|
);
|
|
@@ -116,9 +116,17 @@ export class ResolverService {
|
|
|
116
116
|
attr.element_type === 'date' ||
|
|
117
117
|
attr.element_type === 'datetime'
|
|
118
118
|
) {
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
119
|
+
// Allow both DD-MM-YYYY and standard ISO YYYY-MM-DD
|
|
120
|
+
const allowedFormats =
|
|
121
|
+
attr.element_type === 'date'
|
|
122
|
+
? ['DD-MM-YYYY', 'YYYY-MM-DD']
|
|
123
|
+
: ['DD-MM-YYYY HH:mm:ss', 'YYYY-MM-DD HH:mm:ss', moment.ISO_8601];
|
|
124
|
+
|
|
125
|
+
// strict parsing enabled
|
|
126
|
+
const dateValue = moment(codeValue, allowedFormats, true).utcOffset(
|
|
127
|
+
'+05:30',
|
|
128
|
+
);
|
|
129
|
+
|
|
122
130
|
if (dateValue.isValid()) {
|
|
123
131
|
resolvedEntityData[field] =
|
|
124
132
|
attr.element_type === 'date'
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
-
<module type="WEB_MODULE" version="4">
|
|
3
|
-
<component name="NewModuleRootManager">
|
|
4
|
-
<content url="file://$MODULE_DIR$">
|
|
5
|
-
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
|
|
6
|
-
<excludeFolder url="file://$MODULE_DIR$/temp" />
|
|
7
|
-
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
|
8
|
-
</content>
|
|
9
|
-
<orderEntry type="inheritedJdk" />
|
|
10
|
-
<orderEntry type="sourceFolder" forTests="false" />
|
|
11
|
-
</component>
|
|
12
|
-
</module>
|
|
@@ -1,59 +0,0 @@
|
|
|
1
|
-
<component name="ProjectCodeStyleConfiguration">
|
|
2
|
-
<code_scheme name="Project" version="173">
|
|
3
|
-
<HTMLCodeStyleSettings>
|
|
4
|
-
<option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
|
|
5
|
-
</HTMLCodeStyleSettings>
|
|
6
|
-
<JSCodeStyleSettings version="0">
|
|
7
|
-
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
|
8
|
-
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
|
9
|
-
<option name="USE_DOUBLE_QUOTES" value="false" />
|
|
10
|
-
<option name="FORCE_QUOTE_STYlE" value="true" />
|
|
11
|
-
<option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
|
|
12
|
-
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
|
13
|
-
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
|
14
|
-
</JSCodeStyleSettings>
|
|
15
|
-
<TypeScriptCodeStyleSettings version="0">
|
|
16
|
-
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
|
17
|
-
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
|
18
|
-
<option name="USE_DOUBLE_QUOTES" value="false" />
|
|
19
|
-
<option name="FORCE_QUOTE_STYlE" value="true" />
|
|
20
|
-
<option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
|
|
21
|
-
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
|
22
|
-
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
|
23
|
-
</TypeScriptCodeStyleSettings>
|
|
24
|
-
<VueCodeStyleSettings>
|
|
25
|
-
<option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
|
|
26
|
-
<option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
|
|
27
|
-
</VueCodeStyleSettings>
|
|
28
|
-
<codeStyleSettings language="HTML">
|
|
29
|
-
<option name="SOFT_MARGINS" value="80" />
|
|
30
|
-
<indentOptions>
|
|
31
|
-
<option name="INDENT_SIZE" value="2" />
|
|
32
|
-
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
33
|
-
<option name="TAB_SIZE" value="2" />
|
|
34
|
-
</indentOptions>
|
|
35
|
-
</codeStyleSettings>
|
|
36
|
-
<codeStyleSettings language="JavaScript">
|
|
37
|
-
<option name="SOFT_MARGINS" value="80" />
|
|
38
|
-
<indentOptions>
|
|
39
|
-
<option name="INDENT_SIZE" value="2" />
|
|
40
|
-
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
41
|
-
<option name="TAB_SIZE" value="2" />
|
|
42
|
-
</indentOptions>
|
|
43
|
-
</codeStyleSettings>
|
|
44
|
-
<codeStyleSettings language="TypeScript">
|
|
45
|
-
<option name="SOFT_MARGINS" value="80" />
|
|
46
|
-
<indentOptions>
|
|
47
|
-
<option name="INDENT_SIZE" value="2" />
|
|
48
|
-
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
49
|
-
<option name="TAB_SIZE" value="2" />
|
|
50
|
-
</indentOptions>
|
|
51
|
-
</codeStyleSettings>
|
|
52
|
-
<codeStyleSettings language="Vue">
|
|
53
|
-
<option name="SOFT_MARGINS" value="80" />
|
|
54
|
-
<indentOptions>
|
|
55
|
-
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
56
|
-
</indentOptions>
|
|
57
|
-
</codeStyleSettings>
|
|
58
|
-
</code_scheme>
|
|
59
|
-
</component>
|
package/.idea/modules.xml
DELETED
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
-
<project version="4">
|
|
3
|
-
<component name="ProjectModuleManager">
|
|
4
|
-
<modules>
|
|
5
|
-
<module fileurl="file://$PROJECT_DIR$/.idea/250218_ether_core.iml" filepath="$PROJECT_DIR$/.idea/250218_ether_core.iml" />
|
|
6
|
-
</modules>
|
|
7
|
-
</component>
|
|
8
|
-
</project>
|