Merge pull request #287 from YujithIsura/master

backend validation added for party delete

client/src/components/AddParty/index.js

@@ -54,6 +54,10 @@ const styles = theme => ({
         marginBottom: 20,
         marginTop: 50
     },
+    logocontainer: {
+        height: '100%',
+        marginTop:-55
+      },
 });
 
 class PartyRegistration extends React.Component {
@@ -540,8 +544,10 @@ class PartyRegistration extends React.Component {
                     <span ><FileUpload  value={this.state.paySlip} doneElement={doneElement} onSelectFiles={this.onSelectFiles} /></span>
                     </span>
                     </Grid>
-                    <Grid style={{marginTop:30,marginLeft:-10}}container item lg={4}>
-                        <img src={this.state.file}/>
+                    <Grid style={{marginTop:30,marginLeft:-10}} container item lg={4}>
+                        <div className={classes.logocontainer} >
+                        <img style={{maxWidth: 60,margin:25}} src={this.state.file}/>
+                        </div>
                     </Grid>
                     </Grid>
 

client/src/components/ElectionTemplateList/index.js

@@ -0,0 +1,80 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { withStyles } from '@material-ui/core/styles';
+import AppBar from '@material-ui/core/AppBar';
+import Tabs from '@material-ui/core/Tabs';
+import Tab from '@material-ui/core/Tab';
+import Typography from '@material-ui/core/Typography';
+
+
+function TabContainer(props) {
+    return (
+        <Typography component="div" style={{ padding: 8 * 3 }}>
+            {props.children}
+        </Typography>
+    );
+}
+
+TabContainer.propTypes = {
+    children: PropTypes.node.isRequired,
+};
+
+const styles = theme => ({
+    root: {
+        flexGrow: 1,
+        width: '100%',
+        backgroundColor: theme.palette.background.paper,
+    },
+    tabs: {
+        backgroundColor: '#dcdfe5',
+    }
+});
+
+class ScrollableTabsButtonAuto extends React.Component {
+    state = {
+        value: 0,
+    };
+
+    handleChange = (event, value) => {
+        this.setState({ value });
+    };
+
+    render() {
+        const { classes , customProps ,onCloseModal,callElectionPendingElements,callElectionRejectedElements,callElectionApproveElements } = this.props;
+        const { value } = this.state;
+
+            return (
+                <div className={classes.root}>
+                    <AppBar style={{color:'black'}} position="static" >
+                        <Tabs
+                            classes={{flexContainer: classes.tabs}}
+                            value={value}
+                            onChange={this.handleChange}
+                            // indicatorColor="primary"
+                            // textColor="primary"
+                            scrollable
+                            scrollButtons="auto"
+                        >
+                            <Tab label="Pending Templates" />
+                            <Tab label="Approved Templates" />
+                            <Tab label="Rejected Templates" />
+
+
+                        </Tabs>
+                    </AppBar>
+                    {value === 0 && <TabContainer>{callElectionPendingElements}</TabContainer>}
+                    {value === 1 && <TabContainer>{callElectionApproveElements}</TabContainer>}
+                    {value === 2 && <TabContainer>{callElectionRejectedElements}</TabContainer>}
+
+
+                </div>
+            );
+
+    }
+}
+
+ScrollableTabsButtonAuto.propTypes = {
+    classes: PropTypes.object.isRequired,
+};
+
+export default withStyles(styles)(ScrollableTabsButtonAuto);

client/src/components/UpdateParty/index.js

@@ -105,7 +105,6 @@ class PartyRegistration extends React.Component {
 
 
     handleChange = (name) => event => {
-        debugger;
         if (name === 'phone') {
             this.setState({ errorTextPhone: '' });
         }
@@ -178,7 +177,6 @@ class PartyRegistration extends React.Component {
             this.setState({ errorTextSecretaryName: 'emptyField' });
             goNext = false;
         }
-        debugger;
 
         if (this.state.phoneList.length === 0 || this.state.phoneList.length === null) {
             this.setState({ errorTextPhone: 'emptyField' });
@@ -189,7 +187,6 @@ class PartyRegistration extends React.Component {
             this.setState({ errorTextFax: 'emptyField' });
             goNext = false;
         }
-debugger;
         if (goNext) {
             updateParty(this.state.partyId,this.state);
             onCloseModal();
@@ -305,7 +302,6 @@ debugger;
           }else{
             var faxList = [];
           }
-          debugger;
           getPartyLogo(PartyDetails.fileName);
           this.setState({partyName:PartyDetails.partyName});
           this.setState({partyType:PartyDetails.partyType});

client/src/modules/election-model/Template_review.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { withStyles } from '@material-ui/core/styles';
 import AdminMenu from '../../components/AdminMenu/AdminMenu';
-import CallElectionList from '../../components/CallElectionList';
+import ElectionTemplateList from '../../components/ElectionTemplateList';
 import CallElection from '../../modules/election/CallElection';
 import Typography from '@material-ui/core/Typography';
 import Grid from '@material-ui/core/Grid';
@@ -266,7 +266,7 @@ class Home extends React.Component {
 
                         <Grid item xs={8} >
                             <div style={{ width: '100%' }}>
-                                <CallElectionList callElectionApproveElements={callElectionApproveElements} callElectionPendingElements={callElectionPendingElements} callElectionRejectedElements={callElectionRejectedElements}></CallElectionList>
+                                <ElectionTemplateList callElectionApproveElements={callElectionApproveElements} callElectionPendingElements={callElectionPendingElements} callElectionRejectedElements={callElectionRejectedElements}></ElectionTemplateList>
                             </div>
                         </Grid>
                         <Grid item xs={5} >

client/src/modules/party/state/PartyAction.js

@@ -79,6 +79,7 @@ export function saveParty(partyDetails) {
        dispatch(setData(newPartyData));
        dispatch(openSnackbar({ message:`New party has been registered successfully!`}));
     }).catch(err => {
+      dispatch(openSnackbar({ message: err.response.data.message }));
           console.log(err)
     });
   };
@@ -125,6 +126,7 @@ export function updateParty(teamId,partyDetails) {
        dispatch(setUpdateData(newPartyData));
        dispatch(openSnackbar({ message:`The party has been updated successfully!`}));
     }).catch(err => {
+      dispatch(openSnackbar({ message: err.response.data.message }));
           console.log(err)
     });
   };
@@ -173,7 +175,7 @@ export function deleteParty(teamId) {
          dispatch(
           setDeleteParty(getDeletedParty)
            );
-           dispatch(openSnackbar({ message: "Candidate was deleted successfully!"}));
+           dispatch(openSnackbar({ message: "Party was deleted successfully!"}));
       }).catch(err => {
         const getDeletedParty = [];
         dispatch(

server/src/repository/team.js

@@ -144,6 +144,19 @@ const updateTeamStatus = (partyId) => {
 			});
 };
 
+const TEAM_SELECT_QUERY_FROM_NOMINATION = `SELECT * FROM NOMINATION WHERE TEAM_ID=:team_id`;
+
+const teamValidation = (team_id) => {
+    const params = { team_id: team_id };
+    return DbConnection()
+        .query(TEAM_SELECT_QUERY_FROM_NOMINATION,
+            {
+                replacements: params,
+                type: DbConnection().QueryTypes.SELECT,
+            }).catch((error) => {
+                throw new DBError(error);
+            });
+};
 
 
 
@@ -153,5 +166,6 @@ export default {
   fetchAllTeamsByTeamType,
   insertTeam,
   updateTeam,
-  updateTeamStatus
+  updateTeamStatus,
+  teamValidation
 }

server/src/service/teamService.js

@@ -2,7 +2,7 @@ import { ServerError , ApiError } from 'Errors';
 import TeamRepo from '../repository/team';
 import {TeamManager}  from 'Managers';
 import _ from 'lodash';
-import {HTTP_CODE_404} from '../routes/constants/HttpCodes';
+import {HTTP_CODE_404,HTTP_CODE_403} from '../routes/constants/HttpCodes';
 const uuidv4 = require('uuid/v4');
 
 
@@ -99,7 +99,7 @@ const createTeam = async (req) => {
 		await TeamRepo.insertTeam(teamData);
 		return teamData;
 	} catch (e) {
-		throw new ServerError("server error");
+		throw e;
 	}
 };
 
@@ -148,18 +148,24 @@ const updateTeamById = async (req) => {
 		await TeamRepo.updateTeam(teamData);
 		return teamData;
 	} catch (e) {
-		throw new ServerError("server error");
+		throw e;
 	}
 };
 
 //Delete party details for a particular party
 const deletePartyById = async (req) => {
 	try {
     const partyId = req.params.teamId;
-		await TeamRepo.updateTeamStatus(partyId);
-		return partyId;
+    const partyExist = await TeamRepo.teamValidation(partyId);
+    if(_.isEmpty(partyExist)){
+      await TeamRepo.updateTeamStatus(partyId);
+      return partyId;
+    }else{
+      throw new ApiError("Sorry, This party already been used!",HTTP_CODE_403);
+    }
+
 	} catch (e) {
-		throw new ServerError("server error");
+		throw e;
 	}
 };