3 Commits be6b212356 ... c28cf9957b

Author SHA1 Message Date
  Marina Yakovenko c28cf9957b admin-results 5 years ago
  Marina Yakovenko 0b30c50c94 Merge branch 'dev' of http://gitlab.a-level.com.ua/Entony/FEA_12_TRIATHLON into dev 5 years ago
  Marina Yakovenko a0901aa1dc admin-results 5 years ago

+ 1 - 1
src/components/adminPhotogalary/adminPhotogalaryReduxForm.js

@@ -38,7 +38,7 @@ class PhotogalaryReduxForm extends Component {
 
     onChangeTypeHandler = e => {
         const { name, value } = e.target;
-        console.log('eventInput', value)
+        // console.log('eventInput', value)
         this.setState(prevState => {
             console.log('prevStateInput', prevState)
             return {

+ 8 - 17
src/components/adminResults/adminResultsForm.js

@@ -6,35 +6,23 @@ import { customSelect } from "../customFields/customSelect/customSelect";
 
 class AdminResultsForm extends Component {
 
-    // state = {
-        // addPhotogalaryInitialValue,
-        // filteredEventList: []
-    // }
-
-    submit = values => {
-        console.log('submit props', this.props)
-        // console.log('submit state', this.state)
-        // const pictures = this.state.addPhotogalaryInitialValue.pictures.reduce((prev, elem) => {
-        //     return prev.concat(elem.value);
-        // }, []);
-    }
-
     render() {
         // const { filteredEventList, addPhotogalaryInitialValue } = this.state;
         // console.log(this.state )
 
         const {
             handleSubmit,
+            submitHandler,
             eventTypes,
             eventList,
-            //  eventByTitle,
             eventusers,
             onChangeTypeHandler,
-            onChangeTitleHandler
+            onChangeTitleHandler,
+            onChangeInputTimeHandler
         } = this.props;
 
         return (
-            <form className="results-form__results-form__main" onSubmit={handleSubmit(this.submit)}>
+            <form className="results-form__results-form__main" onSubmit={handleSubmit(submitHandler)}>
 
                 <Field
                     name="eventType"
@@ -74,10 +62,13 @@ class AdminResultsForm extends Component {
                         <div className = "results-form__user-data_email">{elem.email}</div>
                         <div className = "results-form__user-data_country">{elem.userCountry}</div>
                         <div className = "results-form__user-data_distance">{elem.distance}</div>
+                        {/* <input id = {elem._id} className="input-box -wide" value = '' onChange = {onChangeInputTimeHandler}/> */}
                         <Field
-                            name="time"
+                            id = {elem._id}
+                            name={elem._id}
                             component={customInput}
                             className="input-box -wide"
+                            onChange = {onChangeInputTimeHandler}
                         />
                     </div>
                 )}

+ 50 - 16
src/conteiners/adminResultsPage/adminResultsPage.js

@@ -8,7 +8,13 @@ import ResultsForm from "../../components/adminResults/adminResultsForm";
 import ConfirmationMessage from "../../components/confirmationMessage/confirmationMessage";
 
 class AdminResultstPage extends Component {
-    state = { 
+    state = {
+        // resultState: [
+        //     {
+        //         eventUser: {},
+        //         time: ''
+        //     }
+        // ],
         confirmationMessageFlag: false
      };
 
@@ -17,18 +23,32 @@ class AdminResultstPage extends Component {
         // this.props.getRegistredUsers()
     }
 
-    // showConfirmationMessage = () => {
-    //     this.setState({confirmationMessageFlag: true })
-    //     document.location.reload(true);
-    // };
-    // closeConfirmationMessage = () => {
-    //     this.setState({confirmationMessageFlag: false })
-    // };
+    showConfirmationMessage = () => {
+        this.setState({confirmationMessageFlag: true })
+        document.location.reload(true);
+    };
+    closeConfirmationMessage = () => {
+        this.setState({ confirmationMessageFlag: false })
+    };
+
+    submitHandler = values => {
+        console.log('this.props.eventusers', this.props.eventusers)
+        console.log('submit values', values)
+        const results = Object.keys(values)
+            .filter(elem => elem !== 'eventType')
+            .map(elem => elem = {
+                eventUser: this.props.eventusers.find(
+                    user => user._id === elem), time: values[elem]
+            }
+            )
+
+        console.log('submit results', results)
+    }
 
     onChangeTypeHandler = e => {
         const { value } = e.target;
         this.props.getEvents(value)
-        console.log('onChangeTypeHandler', value)
+        // console.log('onChangeTypeHandler',  value)
     };
 
     onChangeTitleHandler = e => {
@@ -41,13 +61,30 @@ class AdminResultstPage extends Component {
         // console.log('onChangeTitleHandler', value)
     };
 
+    // onChangeInputTimeHandler = e => {
+    //     const { value, id, name } = e.target;
+    //     console.log('onChangeInputTimeHandler value', value, id)
+    //         this.setState(prevState => {
+    //             console.log('prevState resultState', prevState)
+    //             return {
+    //                 ...prevState,
+    //                 resultState: [
+    //                     ...prevState.resultState,
+    //                     {
+    //                     eventuser: this.props.eventusers.find( elem => elem._id === id),
+    //                     time: value,
+    //                     id: id
+    //                     }
+    //                 ]
+    //             };
+    //         });
+    // }
+
     render() {
         const {
             eventTypes,
             eventList,
-            // eventByTitle,
             eventusers,
-            // postPhotogalary,
         } = this.props
 
         console.log('page props', this.props)
@@ -61,14 +98,11 @@ class AdminResultstPage extends Component {
                 <div className="results-form">
                     <div className="results-form__content">
                         <h2 className="results-form__form-title">RESULTS</h2>
-                        {/* <PhotogalaryForm 
-                            eventTypes={eventTypes} 
-                            eventList={eventList} 
-                            submitHandler = {postPhotogalary}
-                        /> */}
                         <ResultsForm 
                             eventTypes={eventTypes}
                             eventList={eventList}
+                            submitHandler = {this.submitHandler}
+                            onChangeInputTimeHandler = {this.onChangeInputTimeHandler}
                             // eventByTitle ={eventByTitle}
                             eventusers={eventusers}
                             onChangeTypeHandler = {this.onChangeTypeHandler}

+ 2 - 2
src/reducers/adminResultsReduser.js

@@ -12,8 +12,8 @@ export default (state = initialState, action) => {
 		case types.GET_EVENTS_REQUEST_SUCCESS: {
 			const { data } = action.payload;
             const eventusers = data.eventusers
-            console.log('state', state)
-            console.log('result reduser users', eventusers)
+            // console.log('state', state)
+            // console.log('result reduser users', eventusers)
 			return { ...state, eventusers };
 		}
 		case types.GET_EVENTS_REQUEST_FAIL: {