Compare commits

..

No commits in common. "d738049742a47e75872ae177aaed76be140b2fbe" and "c1e3d302947598550096c632cf13820fdc341553" have entirely different histories.

3 changed files with 10 additions and 8 deletions

View File

@ -1,5 +1,6 @@
import React, { Component } from "react"; import React, { Component } from "react";
import ReportSingleMigration from "../common/Forms/ReportSingleMigration";
import { callAPI } from "../../actions/API"; import { callAPI } from "../../actions/API";
import { GenericForm } from "../common/Forms/GenericForm"; import { GenericForm } from "../common/Forms/GenericForm";

View File

@ -11,6 +11,7 @@ import {
import classnames from "classnames"; import classnames from "classnames";
import EmailBooking from "./EmailBooking"; import EmailBooking from "./EmailBooking";
import { CPanelForm } from "./CPanelForm";
import { GenericForm } from "./GenericForm"; import { GenericForm } from "./GenericForm";
const FormPage = ({ timeslots, item }) => { const FormPage = ({ timeslots, item }) => {
@ -52,7 +53,7 @@ const FormPage = ({ timeslots, item }) => {
<Row> <Row>
<Col> <Col>
{/* <CPanelForm timeslots={timeslots} key={timeslots.id} /> */} {/* <CPanelForm timeslots={timeslots} key={timeslots.id} /> */}
<GenericForm timeslots={timeslots} key={timeslots.id} /> <GenericForm timeslots={timeslots} key={timeslots.id}/>
</Col> </Col>
</Row> </Row>
</TabPane> </TabPane>

View File

@ -77,13 +77,7 @@ const CompTable = (props) => {
sizePerPageRenderer, // A numeric array is also available. the purpose of above example is custom the text sizePerPageRenderer, // A numeric array is also available. the purpose of above example is custom the text
}; };
let columns = [ const columns = [
{
dataField: "domain",
text: "Domain",
sort: true,
formatter: (cell, row) => <a href={"migrations/" + row.id}> {cell} </a>,
},
{ dataField: "id", text: "ID", hidden: true }, { dataField: "id", text: "ID", hidden: true },
{ dataField: "brand", text: "Brand", sort: true }, { dataField: "brand", text: "Brand", sort: true },
{ dataField: "migration_status", text: "Status", sort: true }, { dataField: "migration_status", text: "Status", sort: true },
@ -114,6 +108,12 @@ const CompTable = (props) => {
}, },
{ dataField: "booked_date", text: "Booked Date", sort: true }, { dataField: "booked_date", text: "Booked Date", sort: true },
{ dataField: "agent_booked", text: "Agent initials", sort: true }, { dataField: "agent_booked", text: "Agent initials", sort: true },
{
dataField: "domain",
text: "Domain",
sort: true,
formatter: (cell, row) => <a href={"migrations/" + row.id}> {cell} </a>,
},
{ dataField: "additional_domains", text: "Additional Domains", sort: true }, { dataField: "additional_domains", text: "Additional Domains", sort: true },
{ dataField: "username", text: "Username", sort: true }, { dataField: "username", text: "Username", sort: true },
{ dataField: "migration_type", text: "Type", sort: true }, { dataField: "migration_type", text: "Type", sort: true },