Merged in feature/IO-3554-Form-Row-Layout (pull request #3068)
feature/IO-3554-Form-Row-Layout - dial in tables
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
import { BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined } from "@ant-design/icons";
|
||||
import { Card, Space, Switch, Tooltip, Typography } from "antd";
|
||||
import ResponsiveTable from "../../responsive-table/responsive-table.component";
|
||||
import { Card, Space, Switch, Table, Tooltip, Typography } from "antd";
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Link } from "react-router-dom";
|
||||
@@ -360,11 +359,11 @@ export default function DashboardScheduledDeliveryToday({ data, ...cardProps })
|
||||
{...cardProps}
|
||||
>
|
||||
<div style={{ height: "100%" }}>
|
||||
<ResponsiveTable
|
||||
<Table
|
||||
onChange={handleTableChange}
|
||||
pagination={false}
|
||||
columns={isTvModeScheduledDelivery ? tvColumns : columns}
|
||||
mobileColumnKeys={["ro_number", "owner", "status", "vehicle"]}
|
||||
// mobileColumnKeys={["ro_number", "owner", "status", "vehicle"]}
|
||||
scroll={{ x: true, y: "calc(100% - 2em)" }}
|
||||
rowKey="id"
|
||||
style={{ height: "85%" }}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined } from "@ant-design/icons";
|
||||
import { Card, Space, Switch, Tooltip, Typography } from "antd";
|
||||
import ResponsiveTable from "../../responsive-table/responsive-table.component";
|
||||
import { Card, Space, Switch, Table, Tooltip, Typography } from "antd";
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Link } from "react-router-dom";
|
||||
@@ -365,7 +364,7 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
|
||||
{...cardProps}
|
||||
>
|
||||
<div style={{ height: "100%" }}>
|
||||
<ResponsiveTable
|
||||
<Table
|
||||
onChange={handleTableChange}
|
||||
pagination={false}
|
||||
columns={isTvModeScheduledIn ? tvColumns : columns}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined } from "@ant-design/icons";
|
||||
import { Card, Space, Switch, Tooltip, Typography } from "antd";
|
||||
import ResponsiveTable from "../../responsive-table/responsive-table.component";
|
||||
import { Card, Space, Switch, Table, Tooltip, Typography } from "antd";
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Link } from "react-router-dom";
|
||||
@@ -360,11 +359,11 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
|
||||
{...cardProps}
|
||||
>
|
||||
<div style={{ height: "100%" }}>
|
||||
<ResponsiveTable
|
||||
<Table
|
||||
onChange={handleTableChange}
|
||||
pagination={false}
|
||||
columns={isTvModeScheduledOut ? tvColumns : columns}
|
||||
mobileColumnKeys={["ro_number", "owner", "status", "vehicle"]}
|
||||
// mobileColumnKeys={["ro_number", "owner", "status", "vehicle"]}
|
||||
scroll={{ x: true, y: "calc(100% - 2em)" }}
|
||||
rowKey="id"
|
||||
style={{ height: "85%" }}
|
||||
|
||||
@@ -11,8 +11,7 @@ import {
|
||||
import { PageHeader } from "@ant-design/pro-layout";
|
||||
import { useMutation } from "@apollo/client/react";
|
||||
import { gql } from "@apollo/client";
|
||||
import { Button, Dropdown, Input, Modal, Select, Space, Tag, Typography } from "antd";
|
||||
import ResponsiveTable from "../responsive-table/responsive-table.component";
|
||||
import { Button, Dropdown, Input, Modal, Select, Space, Table, Tag, Typography } from "antd";
|
||||
import axios from "axios";
|
||||
import { useMemo, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -689,9 +688,9 @@ export function JobLinesComponent({
|
||||
}
|
||||
/>
|
||||
|
||||
<ResponsiveTable
|
||||
<Table
|
||||
columns={columns}
|
||||
mobileColumnKeys={["status", "line_desc", "actions", "line_no"]}
|
||||
// mobileColumnKeys={["status", "line_desc", "actions", "line_no"]}
|
||||
rowKey="id"
|
||||
loading={loading}
|
||||
pagination={false}
|
||||
|
||||
@@ -231,9 +231,9 @@ function TaskListComponent({
|
||||
{
|
||||
title: t("tasks.fields.actions"),
|
||||
key: "toggleCompleted",
|
||||
width: "8%",
|
||||
width: 260,
|
||||
render: (text, record) => (
|
||||
<Space orientation="horizontal">
|
||||
<Space orientation="horizontal" size="small" style={{ maxWidth: "100%", whiteSpace: "nowrap" }}>
|
||||
<ShareToTeamsButton
|
||||
linkText=""
|
||||
urlOverride={`${window.location.origin}/manage/tasks/alltasks?taskid=${record.id}`}
|
||||
|
||||
Reference in New Issue
Block a user