Timetickets Fixes
This commit is contained in:
@@ -1,18 +1,10 @@
|
||||
import React, { useCallback, useState, useRef } from "react";
|
||||
import moment from "moment";
|
||||
import {
|
||||
View,
|
||||
Text,
|
||||
StyleSheet,
|
||||
ScrollView,
|
||||
RefreshControl,
|
||||
FlatList,
|
||||
} from "react-native";
|
||||
import React, { useCallback, useState } from "react";
|
||||
import { FlatList, RefreshControl, StyleSheet, Text, View } from "react-native";
|
||||
import {
|
||||
ActivityIndicator,
|
||||
Button,
|
||||
Card,
|
||||
Headline,
|
||||
Subheading,
|
||||
} from "react-native-paper";
|
||||
import styles from "../styles";
|
||||
@@ -24,37 +16,37 @@ import { createStructuredSelector } from "reselect";
|
||||
import { employeeGetRatesStart } from "../../redux/employee/employee.actions";
|
||||
import {
|
||||
selectCurrentEmployee,
|
||||
selectRates,
|
||||
selectGettingRates,
|
||||
selectSignInError,
|
||||
selectEmployeeFullName,
|
||||
selectGettingRates,
|
||||
selectRates,
|
||||
selectSignInError,
|
||||
} from "../../redux/employee/employee.selectors";
|
||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||
|
||||
import CostCenterSelect from "../Selects/select-cost-center";
|
||||
import ErrorDisplay from "../error-display/error-display.component";
|
||||
import { useMutation, useQuery } from "@apollo/client";
|
||||
import {
|
||||
INSERT_NEW_TIME_TICKET,
|
||||
QUERY_ACTIVE_TIME_TICKETS,
|
||||
} from "../../graphql/timetickets.queries";
|
||||
import {
|
||||
selectCurrentTimeTicketJob,
|
||||
selectCurrentTimeTicketJobId,
|
||||
} from "../../redux/timetickets/timetickets.selectors";
|
||||
import { INSERT_NEW_TIME_TICKET } from "../../graphql/timetickets.queries";
|
||||
import { useMutation, useQuery } from "@apollo/client";
|
||||
import { QUERY_ACTIVE_TIME_TICKETS } from "../../graphql/timetickets.queries";
|
||||
import CostCenterSelect from "../Selects/select-cost-center";
|
||||
import ErrorDisplay from "../error-display/error-display.component";
|
||||
|
||||
// import EmployeeClockedInList from "../time-ticket-lists/employee-clockedin-list.component";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import ClockedinListItem from "../time-ticket-items/clockedin-list-item.component";
|
||||
import SignOutButton from "../Buttons/employee-sign-out-button.component";
|
||||
import AddTimeTicketButton from "../Buttons/create-time-ticket-button.component";
|
||||
|
||||
import KeyboardAvoidingComponent from "../keyboards/KeyboardAvoidingComponent";
|
||||
import JobSearchAndSelectModal from "../Modals/JobSearchAndSelectModal";
|
||||
import { useNavigation } from "@react-navigation/native";
|
||||
import JobSearchAndSelectModal from "../Modals/JobSearchAndSelectModal";
|
||||
import KeyboardAvoidingComponent from "../keyboards/KeyboardAvoidingComponent";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
currentEmployee: selectCurrentEmployee,
|
||||
loaderGettingRates: selectGettingRates,
|
||||
signingError: selectSignInError,
|
||||
signinError: selectSignInError,
|
||||
currentBodyshop: selectBodyshop,
|
||||
currentRatesNCostCenters: selectRates,
|
||||
currentSelectedTimeTicketJobId: selectCurrentTimeTicketJobId,
|
||||
@@ -68,14 +60,9 @@ const mapDispatchToProps = (dispatch) => ({
|
||||
});
|
||||
|
||||
export function ScreenTimeTicketBrowser({
|
||||
loaderGettingRates,
|
||||
currentEmployee,
|
||||
employeeGetRatesStart,
|
||||
signingError,
|
||||
currentBodyshop,
|
||||
currentRatesNCostCenters,
|
||||
currentSelectedTimeTicketJob,
|
||||
currentSelectedTimeTicketJobId,
|
||||
currentEmployeeFullName,
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
@@ -198,7 +185,6 @@ export function ScreenTimeTicketBrowser({
|
||||
<Card style={localStyles.localCardStyle}>
|
||||
<Card.Title
|
||||
title={t("timeticketbrowser.labels.loggedinemployee")}
|
||||
right={(props) => <SignOutButton style={{margin:8}}/>}
|
||||
/>
|
||||
<Card.Content>
|
||||
{currentEmployeeFullName && (
|
||||
@@ -226,9 +212,7 @@ export function ScreenTimeTicketBrowser({
|
||||
icon="plus"
|
||||
style={{ margin: 8 }}
|
||||
>
|
||||
<Text >
|
||||
{t("timeticketbrowser.actions.ticket")}
|
||||
</Text>
|
||||
<Text>{t("timeticketbrowser.actions.ticket")}</Text>
|
||||
</Button>
|
||||
{/* <Button
|
||||
mode="outlined"
|
||||
|
||||
Reference in New Issue
Block a user