added validateTicket Method, UserModal updates memberslist

README.md

@@ -50,3 +50,4 @@
 - [ ] think about public/private DTO's constructor, getters and setters
 - [x] write dtos without circular dependencies
 - [ ] use dtoRequest for PutProjects
+- [ ] render avatarlist after UserModal Update

client/src/components/HorizontalCard.tsx

@@ -6,13 +6,13 @@ interface IProps {
   title: string;
   remainingDays: string;
   validateTicket: (event: MouseEvent) => void;
-  archiveTicket: (event: MouseEvent) => void;
+  // archiveTicket: (event: MouseEvent) => void;
 }
 
 export const HorizontalCard: FC<IProps> = ({
   title,
   remainingDays,
-  archiveTicket,
+  // archiveTicket,
   validateTicket
 }) => {
   return (
@@ -34,11 +34,11 @@ export const HorizontalCard: FC<IProps> = ({
                   check
                 </i>
               </Link>
-              <Link to="#">
+              {/* <Link to="#">
                 <i className="material-icons" onClick={archiveTicket}>
                   archive
                 </i>
-              </Link>
+              </Link> */}
             </div>
           </div>
         </div>

client/src/components/TabRouter.tsx

@@ -7,6 +7,7 @@ import { AppFile } from "../types/AppFile";
 import { Route, useRouteMatch, Redirect } from "react-router-dom";
 import { ActivityList } from "./ActivityList";
 import { Activity } from "../types/Activity";
+import { NewTicketModal } from "./NewTicketModal";
 
 interface IProps {
   tickets: Ticket[];
@@ -26,6 +27,7 @@ export const TabRouter: FC<IProps> = ({
   return (
     <>
       <div className="row">
+        <NewTicketModal handleClose={() => {}} show={true} />
         <TabRouterHeader tabNames={tabNames} />
 
         <Redirect from={url} to={`${url}/tickets`} />

client/src/components/TicketList.tsx

@@ -3,6 +3,9 @@ import { Ticket } from "../types/Ticket";
 import { FloatingButton } from "./FloatingButton";
 import { HorizontalCard } from "./HorizontalCard";
 import { FilterBar } from "./FilterBar";
+import { put } from "../utils/http";
+import { HttpResponse } from "../types/HttpResponse";
+import { Constants } from "../utils/Constants";
 
 type TicketListProps = {
   tickets: Ticket[];
@@ -13,8 +16,8 @@ export const TicketList: FC<TicketListProps> = ({ tickets }) => {
   const clearFilterText: (e: MouseEvent) => void = (e: MouseEvent) => {
     setFilterText("");
   };
-  const archiveTicket = () => {};
-  const validateTicket = () => {};
+  // const archiveTicket = () => {};
+
   const onClick: (e: MouseEvent) => void = (e: MouseEvent) => {
     e.preventDefault();
   };
@@ -42,16 +45,24 @@ export const TicketList: FC<TicketListProps> = ({ tickets }) => {
       <div className="col s12 grey">
         <ul>
           {tickets
-            .filter(t =>
-              t.title.toLowerCase().includes(filterText.toLowerCase())
+            .filter(
+              t =>
+                t.status !== "Done" &&
+                t.title.toLowerCase().includes(filterText.toLowerCase())
             )
             .map((t: Ticket) => (
               <li key={t.id}>
                 <HorizontalCard
                   title={t.title}
                   remainingDays={t.plannedEnding}
-                  validateTicket={validateTicket}
-                  archiveTicket={archiveTicket}
+                  validateTicket={async (e: MouseEvent) => {
+                    e.preventDefault();
+                    await put<HttpResponse<Ticket>>(
+                      `${Constants.ticketsURI}/${t.id}/closed`,
+                      {}
+                    );
+                  }}
+                  // archiveTicket={archiveTicket}
                 />
               </li>
             ))}

client/src/components/UsersModal.tsx

@@ -37,15 +37,14 @@ export const UsersModal: FC<IProps> = ({
     e: FormEvent
   ) => {
     e.preventDefault();
-
-    const response: HttpResponse<User[]> = await patch<User[]>(
+    await patch<User[]>(
       `${Constants.projectsURI}/${id}/members`,
-      members
+      members.map(m => m.id)
     );
-    console.log(response);
+    handleClose();
   };
-  console.log(allUsers);
 
+  useEffect(() => {});
   return (
     <Modal show={show} handleClose={handleClose}>
       <div className="row valign-wrapper blue">

client/src/components/UsersModalEntry.tsx

@@ -9,7 +9,6 @@ interface IProps {
 }
 
 export const UsersModalEntry: FC<IProps> = ({ user, setMembers, members }) => {
-  console.log(members);
   const match: (id: string) => boolean = (id: string) => {
     return Boolean(members.find(m => m.id === id));
   };