vinoth
/
mobile_local_restore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sprint-bug-fixing (#4) 

General pull & push

Co-authored-by: Karthik Sammy <10769@intelizign.com>
Reviewed-on: WizdomWaves/TedQuMobileApp#4
This commit is contained in:
karthik 2024-11-15 04:39:46 +00:00
parent 2a1f8e3f01
commit 24932b4113
8 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/app/src/main/AndroidManifest.xml
View File

@ -10,6 +10,7 @@
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.CAMERA"/> <uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="android.permission.RECORD_AUDIO"/> <uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.READ_CONTACTS"/> <uses-permission android:name="android.permission.READ_CONTACTS"/>

4
package-lock.json generated
View File

@ -54,7 +54,7 @@
"react": "18.2.0", "react": "18.2.0",
"react-native": "0.73.5", "react-native": "0.73.5",
"react-native-app-intro-slider": "^4.0.4", "react-native-app-intro-slider": "^4.0.4",
"react-native-artag-module": "file:../06_Installables/react-native-artag-module-0.1.4.tgz", "react-native-artag-module": "file:../Installables/react-native-artag-module-0.1.4.tgz",
"react-native-audio-recorder-player": "^3.6.11", "react-native-audio-recorder-player": "^3.6.11",
"react-native-autoheight-webview": "^1.6.5", "react-native-autoheight-webview": "^1.6.5",
"react-native-big-calendar": "^4.15.0", "react-native-big-calendar": "^4.15.0",
@ -18764,7 +18764,7 @@
}, },
"node_modules/react-native-artag-module": { "node_modules/react-native-artag-module": {
"version": "0.1.2", "version": "0.1.2",
"resolved": "file:../06_Installables/react-native-artag-module-0.1.4.tgz", "resolved": "file:../Installables/react-native-artag-module-0.1.4.tgz",
"integrity": "sha512-PCLkgTS8MHITcG+UIdPhMnCfakVdj9esTlRiMcVSTVgLVv/Mqg0+ZGueXPZi5TUHZZum+zqe9Xsfy2D/UPADrg==", "integrity": "sha512-PCLkgTS8MHITcG+UIdPhMnCfakVdj9esTlRiMcVSTVgLVv/Mqg0+ZGueXPZi5TUHZZum+zqe9Xsfy2D/UPADrg==",
"license": "MIT", "license": "MIT",
"peerDependencies": { "peerDependencies": {

2
package.json
View File

@ -56,7 +56,7 @@
"react": "18.2.0", "react": "18.2.0",
"react-native": "0.73.5", "react-native": "0.73.5",
"react-native-app-intro-slider": "^4.0.4", "react-native-app-intro-slider": "^4.0.4",
"react-native-artag-module": "file:../06_Installables/react-native-artag-module-0.1.4.tgz", "react-native-artag-module": "file:../Installables/react-native-artag-module-0.1.4.tgz",
"react-native-audio-recorder-player": "^3.6.11", "react-native-audio-recorder-player": "^3.6.11",
"react-native-autoheight-webview": "^1.6.5", "react-native-autoheight-webview": "^1.6.5",
"react-native-big-calendar": "^4.15.0", "react-native-big-calendar": "^4.15.0",

2
src/api/license.api.tsx
View File

@ -30,7 +30,7 @@ export const getMenuList = async ({token, academic_year, app_type}: any) => {
headers: { 'Content-Type': apiConfig.contentTypeJSON } headers: { 'Content-Type': apiConfig.contentTypeJSON }
} }
const url = `${Constants.easConfig.extra.LICENSE_BASE_URL + SCHOOL_LIST_API.GET_LICENSE_SCHOOLS}` const url = `${Constants.easConfig.extra.LICENSE_BASE_URL + SCHOOL_LIST_API.GET_LICENSE_SCHOOLS}`
console.log(Constants.easConfig.extra)
return fetchAPI(url, requestOptions) return fetchAPI(url, requestOptions)
} }

2
src/constants/Constants.tsx
View File

@ -59,7 +59,7 @@ export const getSchoolId = async () => {
const userData = await AsyncStorage.getItem("schoolId") const userData = await AsyncStorage.getItem("schoolId")
if(userData) { if(userData) {
const userDetails: any = JSON.parse(userData) const userDetails: any = JSON.parse(userData)
// console.log(userDetails)
return userDetails return userDetails
} }
return null return null

6
src/screens/SchoolCalendar/SchoolCalendar.tsx
View File

@ -22,7 +22,7 @@ class SchoolCalendar extends Component<any, any> {
super(props); super(props);
this.state = { this.state = {
academicYear: '', academicYear: '',
currentDate: new Date(2024, 9, 1), currentDate: new Date(),
eventsData: [], eventsData: [],
tooltipVisible: false, tooltipVisible: false,
hoveredEvent: null, hoveredEvent: null,
@ -131,7 +131,7 @@ class SchoolCalendar extends Component<any, any> {
render() { render() {
const { currentDate, eventsData, modalVisible, selectedEvent } = this.state; const { currentDate, eventsData, modalVisible, selectedEvent } = this.state;
return ( return (
<TouchableWithoutFeedback onPress={this.handleOutsideClick}> <TouchableWithoutFeedback onPress={this.handleOutsideClick}>
{eventsData && ( {eventsData && (
@ -148,7 +148,7 @@ class SchoolCalendar extends Component<any, any> {
eventCellStyle={(event: MyEvent) => ({ eventCellStyle={(event: MyEvent) => ({
backgroundColor: event.color || 'blue', backgroundColor: event.color || 'blue',
borderRadius: 5, borderRadius: 5,
zIndex:1000, zIndex:10,
borderWidth: 0, borderWidth: 0,
alignItems: 'center' alignItems: 'center'
})} })}

2
src/screens/Student/StudentView.tsx
View File

@ -183,7 +183,7 @@ class StudentView extends React.Component<any, any>{
<View style={{ flexDirection: 'column', alignSelf: 'center', justifyContent: 'center', width: '20%' }}> <View style={{ flexDirection: 'column', alignSelf: 'center', justifyContent: 'center', width: '20%' }}>
{ {
item?.studentclass_details?.profile_picture ? (this.imageBaseUrl && item?.studentclass_details?.profile_picture) ?
<View style={[{ alignSelf: 'center', justifyContent: 'center' }]}> <View style={[{ alignSelf: 'center', justifyContent: 'center' }]}>
<Image defaultSource={Images.avatar} source={{ uri: `${this.imageBaseUrl + item?.studentclass_details?.profile_picture}` }} <Image defaultSource={Images.avatar} source={{ uri: `${this.imageBaseUrl + item?.studentclass_details?.profile_picture}` }}
style={[AppStyles.listViewImage, BaseStyles.marRight10]} /> style={[AppStyles.listViewImage, BaseStyles.marRight10]} />

15
yarn.lock
View File

@ -6041,11 +6041,6 @@ fs.realpath@^1.0.0:
resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
fsevents@^2.3.2:
version "2.3.3"
resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz"
integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
function-bind@^1.1.2: function-bind@^1.1.2:
version "1.1.2" version "1.1.2"
resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz" resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"
@ -7508,10 +7503,10 @@ lighthouse-logger@^1.0.0:
debug "^2.6.9" debug "^2.6.9"
marky "^1.2.2" marky "^1.2.2"
lightningcss-darwin-x64@1.19.0: lightningcss-win32-x64-msvc@1.19.0:
version "1.19.0" version "1.19.0"
resolved "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.19.0.tgz" resolved "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.19.0.tgz"
integrity sha512-Lif1wD6P4poaw9c/4Uh2z+gmrWhw/HtXFoeZ3bEsv6Ia4tt8rOJBdkfVaUJ6VXmpKHALve+iTyP2+50xY1wKPw== integrity sha512-C+VuUTeSUOAaBZZOPT7Etn/agx/MatzJzGRkeV+zEABmPuntv1zihncsi+AyGmjkkzq3wVedEy7h0/4S84mUtg==
lightningcss@~1.19.0: lightningcss@~1.19.0:
version "1.19.0" version "1.19.0"
@ -9046,9 +9041,9 @@ react-native-app-intro-slider@^4.0.4:
resolved "https://registry.npmjs.org/react-native-app-intro-slider/-/react-native-app-intro-slider-4.0.4.tgz" resolved "https://registry.npmjs.org/react-native-app-intro-slider/-/react-native-app-intro-slider-4.0.4.tgz"
integrity sha512-Zkjaol6X3BbZkHUpVDj2LjdidpS6rCgKi0fx80xgGKa0pHxBRd4swWTv2bHnnvu5k1/HXwYk0mY2TbK+2jHl5w== integrity sha512-Zkjaol6X3BbZkHUpVDj2LjdidpS6rCgKi0fx80xgGKa0pHxBRd4swWTv2bHnnvu5k1/HXwYk0mY2TbK+2jHl5w==
"react-native-artag-module@file:../06_Installables/react-native-artag-module-0.1.4.tgz": "react-native-artag-module@file:../Installables/react-native-artag-module-0.1.4.tgz":
version "0.1.2" version "0.1.2"
resolved "file:../06_Installables/react-native-artag-module-0.1.4.tgz" resolved "file:../Installables/react-native-artag-module-0.1.4.tgz"
integrity sha512-PCLkgTS8MHITcG+UIdPhMnCfakVdj9esTlRiMcVSTVgLVv/Mqg0+ZGueXPZi5TUHZZum+zqe9Xsfy2D/UPADrg== integrity sha512-PCLkgTS8MHITcG+UIdPhMnCfakVdj9esTlRiMcVSTVgLVv/Mqg0+ZGueXPZi5TUHZZum+zqe9Xsfy2D/UPADrg==
react-native-audio-recorder-player@^3.6.11: react-native-audio-recorder-player@^3.6.11: