@axelor/aos-mobile-project 8.5.2 → 8.5.4
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/lib/components/pages/GeneralInformationView/GeneralInformationView.js +1 -4
- package/lib/components/pages/GeneralInformationView/GeneralInformationView.js.map +1 -1
- package/lib/components/pages/TaskCustomFieldsView/TaskCustomFieldsView.js +1 -4
- package/lib/components/pages/TaskCustomFieldsView/TaskCustomFieldsView.js.map +1 -1
- package/lib/components/pages/TaskGeneralInformationView/TaskGeneralInformationView.js +1 -4
- package/lib/components/pages/TaskGeneralInformationView/TaskGeneralInformationView.js.map +1 -1
- package/lib/components/templates/ActivityListView/ActivityListView.js +5 -12
- package/lib/components/templates/ActivityListView/ActivityListView.js.map +1 -1
- package/package.json +5 -5
|
@@ -30,7 +30,7 @@ const GeneralInformationView = ({ additionalDropdownItems, }) => {
|
|
|
30
30
|
}
|
|
31
31
|
return (<View>
|
|
32
32
|
<HeaderContainer expandableFilter={false} fixedItems={<ProjectHeader />}/>
|
|
33
|
-
<ScrollView
|
|
33
|
+
<ScrollView>
|
|
34
34
|
<View style={styles.margin}>
|
|
35
35
|
<DatesDisplay fromDate={project.fromDate} toDate={project.toDate}/>
|
|
36
36
|
<ProjectSiteTags />
|
|
@@ -43,9 +43,6 @@ const GeneralInformationView = ({ additionalDropdownItems, }) => {
|
|
|
43
43
|
</View>);
|
|
44
44
|
};
|
|
45
45
|
const styles = StyleSheet.create({
|
|
46
|
-
scrollView: {
|
|
47
|
-
height: null,
|
|
48
|
-
},
|
|
49
46
|
margin: {
|
|
50
47
|
width: '90%',
|
|
51
48
|
alignSelf: 'center',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneralInformationView.js","sourceRoot":"","sources":["../../../../src/components/pages/GeneralInformationView/GeneralInformationView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAC,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EAAC,eAAe,EAAE,SAAS,EAAE,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AACzC,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,eAAe,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,oBAAoB,EAAC,MAAM,iBAAiB,CAAC;AAErD,MAAM,sBAAsB,GAAG,CAAC,EAC9B,uBAAuB,GAGxB,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAErE,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QACvC,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,CAAC,IAAI,CACH;MAAA,CAAC,eAAe,CACd,gBAAgB,CAAC,CAAC,KAAK,CAAC,CACxB,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,AAAD,EAAG,CAAC,EAEhC;MAAA,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"GeneralInformationView.js","sourceRoot":"","sources":["../../../../src/components/pages/GeneralInformationView/GeneralInformationView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAC,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EAAC,eAAe,EAAE,SAAS,EAAE,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AACzC,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,eAAe,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,oBAAoB,EAAC,MAAM,iBAAiB,CAAC;AAErD,MAAM,sBAAsB,GAAG,CAAC,EAC9B,uBAAuB,GAGxB,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAErE,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QACvC,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,CAAC,IAAI,CACH;MAAA,CAAC,eAAe,CACd,gBAAgB,CAAC,CAAC,KAAK,CAAC,CACxB,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,AAAD,EAAG,CAAC,EAEhC;MAAA,CAAC,UAAU,CACT;QAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CACzB;UAAA,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EACjE;UAAA,CAAC,eAAe,CAAC,AAAD,EAClB;QAAA,EAAE,IAAI,CACN;QAAA,CAAC,SAAS,CACR,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAClC,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,EAE5B;QAAA,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EAClD;QAAA,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,SAAS,EAC7D;QAAA,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC,uBAAuB,CAAC,EACjE;MAAA,EAAE,UAAU,CACd;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE;QACN,KAAK,EAAE,KAAK;QACZ,SAAS,EAAE,QAAQ;KACpB;CACF,CAAC,CAAC;AAEH,eAAe,sBAAsB,CAAC"}
|
|
@@ -30,7 +30,7 @@ const TaskCustomFieldsView = ({}) => {
|
|
|
30
30
|
}, []);
|
|
31
31
|
return (<View style={styles.container}>
|
|
32
32
|
<HeaderContainer expandableFilter={false} fixedItems={<TaskDetailsHeader />}/>
|
|
33
|
-
<ScrollView
|
|
33
|
+
<ScrollView refresh={{ fetcher: onRefresh, loading: false }}>
|
|
34
34
|
<CustomSection titleKey="Project_ProjectAppCustomField" fieldType="appJson" visible={configArray.includes('app')} modelId={projectTask.id} refreshKey={refreshKey} onRefresh={onRefresh}/>
|
|
35
35
|
<CustomSection titleKey="Project_ProjectCustomField" fieldType="projectJson" visible={configArray.includes('project')} modelId={projectTask.id} refreshKey={refreshKey} onRefresh={onRefresh}/>
|
|
36
36
|
<CustomSection titleKey="Project_CategoryCustomField" fieldType="categoryJson" visible={configArray.includes('category')} modelId={projectTask.id} refreshKey={refreshKey} onRefresh={onRefresh}/>
|
|
@@ -41,9 +41,6 @@ const styles = StyleSheet.create({
|
|
|
41
41
|
container: {
|
|
42
42
|
flex: 1,
|
|
43
43
|
},
|
|
44
|
-
scrollView: {
|
|
45
|
-
height: null,
|
|
46
|
-
},
|
|
47
44
|
});
|
|
48
45
|
export default TaskCustomFieldsView;
|
|
49
46
|
//# sourceMappingURL=TaskCustomFieldsView.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskCustomFieldsView.js","sourceRoot":"","sources":["../../../../src/components/pages/TaskCustomFieldsView/TaskCustomFieldsView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAC,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAC,eAAe,EAAE,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C,MAAM,oBAAoB,GAAG,CAAC,EAAE,EAAE,EAAE;IAClC,MAAM,EAAC,WAAW,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAE7E,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEhD,MAAM,WAAW,GAAG,OAAO,CACzB,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,2BAA2B,CAAC,KAAK,CAAC,GAAG,CAAC,EACjE,CAAC,WAAW,CAAC,OAAO,EAAE,2BAA2B,CAAC,CACnD,CAAC;IAEF,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE;QACjC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;IACxC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAC5B;MAAA,CAAC,eAAe,CACd,gBAAgB,CAAC,CAAC,KAAK,CAAC,CACxB,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,AAAD,EAAG,CAAC,EAEpC;MAAA,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"TaskCustomFieldsView.js","sourceRoot":"","sources":["../../../../src/components/pages/TaskCustomFieldsView/TaskCustomFieldsView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAC,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAC,eAAe,EAAE,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C,MAAM,oBAAoB,GAAG,CAAC,EAAE,EAAE,EAAE;IAClC,MAAM,EAAC,WAAW,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAE7E,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEhD,MAAM,WAAW,GAAG,OAAO,CACzB,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,2BAA2B,CAAC,KAAK,CAAC,GAAG,CAAC,EACjE,CAAC,WAAW,CAAC,OAAO,EAAE,2BAA2B,CAAC,CACnD,CAAC;IAEF,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE;QACjC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;IACxC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAC5B;MAAA,CAAC,eAAe,CACd,gBAAgB,CAAC,CAAC,KAAK,CAAC,CACxB,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,AAAD,EAAG,CAAC,EAEpC;MAAA,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAC,CAAC,CACxD;QAAA,CAAC,aAAa,CACZ,QAAQ,CAAC,+BAA+B,CACxC,SAAS,CAAC,SAAS,CACnB,OAAO,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CACrC,OAAO,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CACxB,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,SAAS,CAAC,CAAC,SAAS,CAAC,EAEvB;QAAA,CAAC,aAAa,CACZ,QAAQ,CAAC,4BAA4B,CACrC,SAAS,CAAC,aAAa,CACvB,OAAO,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CACzC,OAAO,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CACxB,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,SAAS,CAAC,CAAC,SAAS,CAAC,EAEvB;QAAA,CAAC,aAAa,CACZ,QAAQ,CAAC,6BAA6B,CACtC,SAAS,CAAC,cAAc,CACxB,OAAO,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAC1C,OAAO,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CACxB,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,SAAS,CAAC,CAAC,SAAS,CAAC,EAEzB;MAAA,EAAE,UAAU,CACd;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE;QACT,IAAI,EAAE,CAAC;KACR;CACF,CAAC,CAAC;AAEH,eAAe,oBAAoB,CAAC"}
|
|
@@ -32,7 +32,7 @@ const TaskGeneralInformationView = ({ handleRefresh = () => { }, }) => {
|
|
|
32
32
|
}, [dispatch]);
|
|
33
33
|
return (<View style={styles.container}>
|
|
34
34
|
<HeaderContainer expandableFilter={false} fixedItems={<TaskDetailsHeader />}/>
|
|
35
|
-
<ScrollView
|
|
35
|
+
<ScrollView refresh={{ loading: loadingProjectTask, fetcher: handleRefresh }}>
|
|
36
36
|
<ProjectSimpleCard code={projectTask.project?.code} name={projectTask.project?.name} projectStatus={projectTask.project?.projectStatus} onPress={() => {
|
|
37
37
|
navigation.popTo('ProjectDetailsScreen', {
|
|
38
38
|
projectId: projectTask.project?.id,
|
|
@@ -47,9 +47,6 @@ const styles = StyleSheet.create({
|
|
|
47
47
|
container: {
|
|
48
48
|
flex: 1,
|
|
49
49
|
},
|
|
50
|
-
scrollView: {
|
|
51
|
-
height: null,
|
|
52
|
-
},
|
|
53
50
|
});
|
|
54
51
|
export default TaskGeneralInformationView;
|
|
55
52
|
//# sourceMappingURL=TaskGeneralInformationView.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskGeneralInformationView.js","sourceRoot":"","sources":["../../../../src/components/pages/TaskGeneralInformationView/TaskGeneralInformationView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,SAAS,EAAC,MAAM,OAAO,CAAC;AACvC,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAE,aAAa,EAAE,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAC,eAAe,EAAE,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAC,iBAAiB,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,wBAAwB,EAAE,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAElE,MAAM,0BAA0B,GAAG,CAAC,EAClC,aAAa,GAAG,GAAG,EAAE,GAAE,CAAC,GAGzB,EAAE,EAAE;IACH,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IAEnC,MAAM,EAAC,WAAW,EAAE,kBAAkB,EAAC,GAAG,WAAW,CACnD,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAC1C,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,QAAQ,CAAC,kBAAkB,EAAE,CAAC,CAAC;IACjC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAC5B;MAAA,CAAC,eAAe,CACd,gBAAgB,CAAC,CAAC,KAAK,CAAC,CACxB,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,AAAD,EAAG,CAAC,EAEpC;MAAA,CAAC,UAAU,CACT,
|
|
1
|
+
{"version":3,"file":"TaskGeneralInformationView.js","sourceRoot":"","sources":["../../../../src/components/pages/TaskGeneralInformationView/TaskGeneralInformationView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,SAAS,EAAC,MAAM,OAAO,CAAC;AACvC,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAE,aAAa,EAAE,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAC,eAAe,EAAE,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAC,iBAAiB,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,wBAAwB,EAAE,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAElE,MAAM,0BAA0B,GAAG,CAAC,EAClC,aAAa,GAAG,GAAG,EAAE,GAAE,CAAC,GAGzB,EAAE,EAAE;IACH,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IAEnC,MAAM,EAAC,WAAW,EAAE,kBAAkB,EAAC,GAAG,WAAW,CACnD,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAC1C,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,QAAQ,CAAC,kBAAkB,EAAE,CAAC,CAAC;IACjC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAC5B;MAAA,CAAC,eAAe,CACd,gBAAgB,CAAC,CAAC,KAAK,CAAC,CACxB,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,AAAD,EAAG,CAAC,EAEpC;MAAA,CAAC,UAAU,CACT,OAAO,CAAC,CAAC,EAAC,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,aAAa,EAAC,CAAC,CAC/D;QAAA,CAAC,iBAAiB,CAChB,IAAI,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAChC,IAAI,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAChC,aAAa,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,aAAa,CAAC,CAClD,OAAO,CAAC,CAAC,GAAG,EAAE;YACZ,UAAU,CAAC,KAAK,CAAC,sBAAsB,EAAE;gBACvC,SAAS,EAAE,WAAW,CAAC,OAAO,EAAE,EAAE;aACnC,CAAC,CAAC;QACL,CAAC,CAAC,EAEJ;QAAA,CAAC,wBAAwB,CAAC,AAAD,EACzB;QAAA,CAAC,iBAAiB,CAAC,AAAD,EACpB;MAAA,EAAE,UAAU,CACd;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE;QACT,IAAI,EAAE,CAAC;KACR;CACF,CAAC,CAAC;AAEH,eAAe,0BAA0B,CAAC"}
|
|
@@ -23,7 +23,7 @@ import { previousProjectActivity } from '../../../api/project-api';
|
|
|
23
23
|
import { ActivityCard } from '../../molecules';
|
|
24
24
|
const ActivityListView = () => {
|
|
25
25
|
const I18n = useTranslator();
|
|
26
|
-
const { project } = useSelector(
|
|
26
|
+
const { project } = useSelector(state => state.project_project);
|
|
27
27
|
const [refreshing, setRefreshing] = useState(false);
|
|
28
28
|
const [dataList, setDataList] = useState([]);
|
|
29
29
|
const [startDate, setStartDate] = useState(() => {
|
|
@@ -47,13 +47,10 @@ const ActivityListView = () => {
|
|
|
47
47
|
try {
|
|
48
48
|
const res = await previousProjectActivity({
|
|
49
49
|
projectId: project?.id,
|
|
50
|
-
startDate: formatDate(_startDate, 'MM
|
|
50
|
+
startDate: formatDate(_startDate, 'YY-MM-DD'),
|
|
51
51
|
});
|
|
52
52
|
const activityList = res.data.data[0]?.values?.$activityList?.[0] || {};
|
|
53
|
-
const formattedData = Object.
|
|
54
|
-
title: date,
|
|
55
|
-
data: activityList[date],
|
|
56
|
-
}));
|
|
53
|
+
const formattedData = Object.entries(activityList).map(([_date, _content]) => ({ title: _date, data: _content }));
|
|
57
54
|
if (formattedData.length === 0 && _startDate >= dateLimit) {
|
|
58
55
|
handlePreviousActivity();
|
|
59
56
|
}
|
|
@@ -70,10 +67,6 @@ const ActivityListView = () => {
|
|
|
70
67
|
fetchActivityData(startDate).finally(() => setRefreshing(false));
|
|
71
68
|
}
|
|
72
69
|
}, [fetchActivityData, startDate, project]);
|
|
73
|
-
const convertToDate = dateStr => {
|
|
74
|
-
const [month, day, year] = dateStr.split('/').map(Number);
|
|
75
|
-
return new Date(year, month - 1, day);
|
|
76
|
-
};
|
|
77
70
|
const onRefresh = useCallback(() => {
|
|
78
71
|
setRefreshing(true);
|
|
79
72
|
setStartDate(() => {
|
|
@@ -85,14 +78,14 @@ const ActivityListView = () => {
|
|
|
85
78
|
}, []);
|
|
86
79
|
const renderItem = ({ item }) => {
|
|
87
80
|
const updates = item[Object.keys(item)[0]];
|
|
88
|
-
return updates.map(update => {
|
|
81
|
+
return updates.map((update) => {
|
|
89
82
|
const { activity = {}, modelName, time, user, utilityClass, title, userId, } = update;
|
|
90
83
|
const tracks = activity?.tracks || [];
|
|
91
84
|
return (<ActivityCard key={time} userId={userId} userName={user} time={time} title={title} tracks={tracks} modelName={modelName} utilityClass={utilityClass}/>);
|
|
92
85
|
});
|
|
93
86
|
};
|
|
94
87
|
const renderSectionHeader = ({ section: { title } }) => {
|
|
95
|
-
const dateToDisplay =
|
|
88
|
+
const dateToDisplay = new Date(title);
|
|
96
89
|
const isValidDate = !isNaN(dateToDisplay.getTime());
|
|
97
90
|
const displayDate = isValidDate ? dateToDisplay : new Date();
|
|
98
91
|
return (<View style={styles.header}>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActivityListView.js","sourceRoot":"","sources":["../../../../src/components/templates/ActivityListView/ActivityListView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,EAAC,MAAM,cAAc,CAAC;AAC3E,OAAO,EACL,WAAW,EACX,UAAU,EACV,WAAW,EACX,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,KAAK,EAAC,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAC,uBAAuB,EAAC,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAE7C,MAAM,gBAAgB,GAAG,GAAG,EAAE;IAC5B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"ActivityListView.js","sourceRoot":"","sources":["../../../../src/components/templates/ActivityListView/ActivityListView.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axelor/aos-mobile-project",
|
|
3
|
-
"version": "8.5.
|
|
3
|
+
"version": "8.5.4",
|
|
4
4
|
"author": "Axelor",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"publishConfig": {
|
|
@@ -27,10 +27,10 @@
|
|
|
27
27
|
"react-native": "0.79.6"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@axelor/aos-mobile-core": "8.5.
|
|
31
|
-
"@axelor/aos-mobile-hr": "8.5.
|
|
32
|
-
"@axelor/aos-mobile-message": "8.5.
|
|
33
|
-
"@axelor/aos-mobile-ui": "8.5.
|
|
30
|
+
"@axelor/aos-mobile-core": "8.5.4",
|
|
31
|
+
"@axelor/aos-mobile-hr": "8.5.4",
|
|
32
|
+
"@axelor/aos-mobile-message": "8.5.4",
|
|
33
|
+
"@axelor/aos-mobile-ui": "8.5.4",
|
|
34
34
|
"@reduxjs/toolkit": "2.9.0"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|