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

Merge pull request 'drawernavigation and instantfeedback time fixes' (#17) from update-existing-code into development 

Reviewed-on: WizdomWaves/TedQuMobileApp#17
This commit is contained in:
vinoth 2024-12-25 05:39:56 +00:00
parent 0e0eba6a41 2717ef7289
commit 885c596314
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/navigation/DrawerNavigator.tsx
View File

@ -78,14 +78,14 @@ const DrawerNavigator = () => {
<Drawer.Screen name="ChangePassword" component={ChangePassword} />
<Drawer.Screen name="School" component={SchoolView} />
<Drawer.Screen name="SchoolUpdate" component={SchoolUpdate} />
<Drawer.Screen name="Class" component={ClassStackNavigator} />
<Drawer.Screen name="Class" component={ClassView} />
<Drawer.Screen name="TeacherAttendance" component={TeacherAttendance} />
<Drawer.Screen name="Pscyometric" component={StudentListPsychometric} />
{/* <Drawer.Screen name="ClassCreate" component={ClassCreate} /> */}
{/* <Drawer.Screen name="ClassUpdate" component={ClasslUpdate} /> */}
<Drawer.Screen name="TeacherView" component={TeeacherStackNavigator} />
{/* <Drawer.Screen name="TeacherCreate" component={TeacherCreate} />
<Drawer.Screen name="TeacherUpdate" component={TeacherUpdate} /> */}
<Drawer.Screen name="ClassCreate" component={ClassCreate} />
<Drawer.Screen name="ClassUpdate" component={ClasslUpdate} />
<Drawer.Screen name="TeacherView" component={TeacherView} />
<Drawer.Screen name="TeacherCreate" component={TeacherCreate} />
<Drawer.Screen name="TeacherUpdate" component={TeacherUpdate} />
<Drawer.Screen name="TeacherInfo" component={TeacherInfo} />
</Drawer.Navigator>
);

2
src/screens/Home.tsx
View File

@ -173,7 +173,7 @@ class Home extends React.Component<any, any> {
const classDataInfo: any = JSON.parse(JSON.stringify(classData))
classDataInfo['academic_year'] = this.state.academicYear.toString()
classDataInfo['name'] = moment().format('MMMM Do YYYY, h:mm:ss a').toString()
classDataInfo['name'] = moment().format('MMMM Do YYYY, h:mm:ss A').toString()
classDataInfo['topics'] = "Feedback"
if (studentList.data) {
if (studentList.data.length) {

2
src/screens/InstantFeedback/InstantFeedbackCreate.tsx
View File

@ -128,7 +128,7 @@ class InstantFeedbackCreate extends React.Component<any, any>{
}
render() {
const defaultFeedbackName: any = moment().format('MMMM Do YYYY, h:mm:ss a').toString()
const defaultFeedbackName: any = moment().format('MMMM Do YYYY, h:mm:ss A').toString()
return (<View style={[AppStyles.containerWoPadding, {}]}>

4
src/screens/Teacher/TeacherCreate.tsx
View File

@ -60,7 +60,7 @@ class TeacherCreate extends React.Component<any, any>{
componentDidUpdate() {
if (this.props.data.hasOwnProperty('status')) {
if (this.props.data.status) {
this.props.navigation.navigate('Teacher')
this.props.navigation.navigate('TeacherView')
} else {
/** Formik Errors on submit */
if (this.formikActions) {
@ -75,7 +75,7 @@ class TeacherCreate extends React.Component<any, any>{
}
onCancel = () => {
this.props.navigation.navigate("Teacher")
this.props.navigation.navigate("TeacherView")
}
onTeacherSubmit = (data: any, actions: any) => {

8
src/screens/Teacher/TeacherUpdate.tsx
View File

@ -58,7 +58,7 @@ class TeacherUpdate extends React.Component<any, any>{
getTeacherDetail({ teacher_id: route.params.teacher_id, token: this.token })
this.props.initTeacher()
} else {
navigation.navigate("Teacher")
navigation.navigate("TeacherView")
}
} else {
navigation.navigate('signin')
@ -68,7 +68,7 @@ class TeacherUpdate extends React.Component<any, any>{
componentDidUpdate() {
if (this.props.data.hasOwnProperty('status')) {
if (this.props.data.status) {
this.props.navigation.navigate('Teacher')
this.props.navigation.navigate('TeacherView')
} else {
/** Formik Errors on submit */
if (this.formikActions) {
@ -83,7 +83,7 @@ class TeacherUpdate extends React.Component<any, any>{
}
onCancel = () => {
this.props.navigation.navigate("Teacher")
this.props.navigation.navigate("TeacherView")
}
onTeacherUpdate = (data: any, actions: any) => {
@ -113,7 +113,7 @@ class TeacherUpdate extends React.Component<any, any>{
if (this.props.info.status) {
firstname = this.props.route.params.data.firstname
lastname = this.props.route.params.data.lastname
gender= this.props.route.params.data.gender,
gender= this.props.info.data.gender,
phoneNumber = this.props.route.params.data.phone_number
emailId = this.props.route.params.data.email_id
imageInput = this.props.route.params.data.image,

4
src/screens/class/classCreate.tsx
View File

@ -46,7 +46,7 @@ class ClassCreate extends React.Component<any, any>{
componentDidUpdate() {
if (this.props.data.hasOwnProperty('status')) {
if (this.props.data.status) {
this.props.navigation.navigate('ClassView')
this.props.navigation.navigate('Class')
} else {
/** Formik Errors on submit */
if(this.formikActions){
@ -61,7 +61,7 @@ class ClassCreate extends React.Component<any, any>{
}
onCancel = () => {
this.props.navigation.navigate("ClassView")
this.props.navigation.navigate("Class")
}
onSelectChange = (event: any, action: any, setFieldValue: any) => {

4
src/screens/class/classUpdate.tsx
View File

@ -49,7 +49,7 @@ class ClasslUpdate extends React.Component<any, any>{
componentDidUpdate() {
if (this.props.data.hasOwnProperty('status')) {
if (this.props.data.status) {
this.props.navigation.navigate('ClassView')
this.props.navigation.navigate('Class')
} else {
/** Formik Errors on submit */
if (this.formikActions) {
@ -64,7 +64,7 @@ class ClasslUpdate extends React.Component<any, any>{
}
onCancel = () => {
this.props.navigation.navigate("ClassView")
this.props.navigation.navigate("Class")
}
onSelectChange = (event: any, action: any, setFieldValue: any) => {