added navigation to new screentimeticketcreate

This commit is contained in:
jfrye122
2023-05-05 09:23:01 -04:00
parent 957c0c6070
commit 57f7adac6e
2 changed files with 33 additions and 17 deletions

View File

@@ -3,18 +3,23 @@ import { Text } from "react-native";
import { Button } from "react-native-paper"; import { Button } from "react-native-paper";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { useNavigation } from "@react-navigation/native";
// const mapDispatchToProps = (dispatch) => ({ // const mapDispatchToProps = (dispatch) => ({
// signOut: () => dispatch(employeeSignOut()), // signOut: () => dispatch(employeeSignOut()),
// }); // });
export function AddTimeTicketButton({ doOnPress }) { export function AddTimeTicketButton() {
const navigation = useNavigation();
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<Button <Button
mode="text" mode="text"
compact={true} compact={true}
onPress={() => doOnPress()} onPress={() => {navigation.navigate("CreateTimeTicket");}}
icon="plus" icon="plus"
> >
<Text style={{fontSize: 12}}>{t("timeticketbrowser.actions.ticket")}</Text> <Text style={{fontSize: 12}}>{t("timeticketbrowser.actions.ticket")}</Text>

View File

@@ -37,6 +37,7 @@ import EmployeeSignIn from "../screen-employee-sign-in/screen-employee-sign-in.c
import ScreenApTimeTicketList from "../screen-ap-time-ticket-list/screen-ap-time-ticket-list.component"; import ScreenApTimeTicketList from "../screen-ap-time-ticket-list/screen-ap-time-ticket-list.component";
import SignOutButton from "../Buttons/employee-sign-out-button.component"; import SignOutButton from "../Buttons/employee-sign-out-button.component";
import AddTimeTicketButton from "../Buttons/create-time-ticket-button.component"; import AddTimeTicketButton from "../Buttons/create-time-ticket-button.component";
import ScreenTimeTicketCreate from "../time-ticket/screen-time-ticket-create.component";
const ActiveJobStack = createNativeStackNavigator(); const ActiveJobStack = createNativeStackNavigator();
const MoreStack = createNativeStackNavigator(); const MoreStack = createNativeStackNavigator();
@@ -138,8 +139,11 @@ const TimeTicketBrowserStackNavigator = connect(
// console.log("App is about to be inactive"); // console.log("App is about to be inactive");
// } // }
if ( appState.current.match(/active|inactive/) && nextAppState === "background" if (
) {// console.log("App is about to be background"); appState.current.match(/active|inactive/) &&
nextAppState === "background"
) {
// console.log("App is about to be background");
signOut(); signOut();
} }
@@ -163,19 +167,25 @@ const TimeTicketBrowserStackNavigator = connect(
component={EmployeeSignIn} component={EmployeeSignIn}
/> />
) : currentEmployee.authorized ? ( ) : currentEmployee.authorized ? (
<TimeTicketBrowserStack.Screen
name="TimeTicketBrowser" <><TimeTicketBrowserStack.Screen
options={{ name="TimeTicketBrowser"
title: i18n.t("timeticketbrowser.titles.timeticketbrowsertab"), options={{
headerRight: () => ( title: i18n.t("timeticketbrowser.titles.timeticketbrowsertab"),
<> headerRight: () => (
<AddTimeTicketButton /> <>
<SignOutButton /> <AddTimeTicketButton />
</> <SignOutButton />
), </>
}} ),
component={ScreenApTimeTicketList} }}
/> component={ScreenApTimeTicketList} /><TimeTicketBrowserStack.Screen
name="CreateTimeTicket"
options={() => ({
title: i18n.t("createtimeticket.titles.createtimeticket"),
})}
component={ScreenTimeTicketCreate} /></>
) : ( ) : (
<TimeTicketBrowserStack.Screen <TimeTicketBrowserStack.Screen
name="EmployeeSignIn" name="EmployeeSignIn"
@@ -185,6 +195,7 @@ const TimeTicketBrowserStackNavigator = connect(
component={EmployeeSignIn} component={EmployeeSignIn}
/> />
)} )}
</TimeTicketBrowserStack.Navigator> </TimeTicketBrowserStack.Navigator>
); );
}); });