diff --git a/src/actions/complains.js b/src/actions/complaints.js similarity index 78% rename from src/actions/complains.js rename to src/actions/complaints.js index 38dfb58..bdf186f 100644 --- a/src/actions/complains.js +++ b/src/actions/complaints.js @@ -1,6 +1,6 @@ import axios from 'axios' -export const getComplains = (url, successCallBack, errCallBack) => { +export const getComplaints = (url, successCallBack, errCallBack) => { return (dispatch) => { axios({ method: 'get', @@ -10,7 +10,7 @@ export const getComplains = (url, successCallBack, errCallBack) => { successCallBack(response) let item = response.data dispatch({ - type: 'GET_ALL_COMPLAINS', + type: 'GET_ALL_COMPLAINTS', payload: item }) }) @@ -19,7 +19,7 @@ export const getComplains = (url, successCallBack, errCallBack) => { }) } } -export const getPendingComplains = (url, successCallBack, errCallBack) => { +export const getPendingComplaints = (url, successCallBack, errCallBack) => { return (dispatch) => { axios({ method: 'get', @@ -29,7 +29,7 @@ export const getPendingComplains = (url, successCallBack, errCallBack) => { successCallBack(response) let item = response.data dispatch({ - type: 'GET_PENDING_COMPLAINS', + type: 'GET_PENDING_COMPLAINTS', payload: item }) }) @@ -38,7 +38,7 @@ export const getPendingComplains = (url, successCallBack, errCallBack) => { }) } } -export const getResolvedComplains = (url, successCallBack, errCallBack) => { +export const getResolvedComplaints = (url, successCallBack, errCallBack) => { return (dispatch) => { axios({ method: 'get', @@ -48,7 +48,7 @@ export const getResolvedComplains = (url, successCallBack, errCallBack) => { successCallBack(response) let item = response.data dispatch({ - type: 'GET_RESOLVED_COMPLAINS', + type: 'GET_RESOLVED_COMPLAINTS', payload: item }) }) diff --git a/src/actions/resolveComplain.js b/src/actions/resolveComplaint.js similarity index 94% rename from src/actions/resolveComplain.js rename to src/actions/resolveComplaint.js index a3ad0e7..5256be6 100644 --- a/src/actions/resolveComplain.js +++ b/src/actions/resolveComplaint.js @@ -2,7 +2,7 @@ import axios from 'axios' import { getCookie } from 'formula_one/src/utils' -export const resolveComplain = ( +export const resolveComplaint = ( id, data, residence, diff --git a/src/components/admin-complaints/index.css b/src/components/admin-complaints/index.css index 25adb6c..f7e8d4d 100644 --- a/src/components/admin-complaints/index.css +++ b/src/components/admin-complaints/index.css @@ -13,16 +13,16 @@ .modalActions{ display: flex; } -.complain-menu { +.complaint-menu { border-bottom: 1px solid transparent; } -.complain-header { +.complaint-header { display: flex; justify-content: space-between; align-items: baseline; } -.complain-header > div { +.complaint-header > div { margin-right: 0.5rem; } diff --git a/src/components/admin-complaints/index.js b/src/components/admin-complaints/index.js index 77bb80c..c92490e 100644 --- a/src/components/admin-complaints/index.js +++ b/src/components/admin-complaints/index.js @@ -22,20 +22,20 @@ import moment from 'moment' import { Loading } from "formula_one" import { - getPendingComplains, - getResolvedComplains, + getPendingComplaints, + getResolvedComplaints, increaseUnsuccefulAttempts, -} from '../../actions/complains' +} from '../../actions/complaints' import { getDefaultItems } from '../../actions/default-items' import { getTimeSlots, changeTimeSlot } from '../../actions/time-slots' -import { resolveComplain } from '../../actions/resolveComplain' +import { resolveComplaint } from '../../actions/resolveComplaint' import { addItem } from '../../actions/add_item' import { - statusComplainsUrl, + statusComplaintsUrl, defaultItemsUrl, - increaseUnsuccesfulComplainsUrl, + increaseUnsuccesfulComplaintsUrl, timeSlotsUrl, - complainsDownloadUrl, + complaintsDownloadUrl, } from '../../urls' import { days, types, entries } from '../constants' @@ -43,10 +43,10 @@ import { toast } from 'react-semantic-toasts' import './index.css' -class AdminComplains extends Component { +class AdminComplaints extends Component { state = { open: false, - pastComplainIcon: 'angle up', + pastComplaintIcon: 'angle up', from: '', to: '', success: false, @@ -71,7 +71,7 @@ class AdminComplains extends Component { foundId: 1, entryNo: '5', entryAprNo: '5', - complainsDownloadUrl: '', + complaintsDownloadUrl: '', options: [], complaint_item : [{default_item:null, quantity:1}], residentSearch: "", @@ -80,14 +80,14 @@ class AdminComplains extends Component { } componentDidMount() { - this.props.setNavigation('Student Complains') - this.props.getPendingComplains( - statusComplainsUrl(this.props.activeHostel, ['pending','inprocess']), + this.props.setNavigation('Student Complaints') + this.props.getPendingComplaints( + statusComplaintsUrl(this.props.activeHostel, ['pending','inprocess']), this.pendingSuccessCallBack, this.pendingErrCallBack ) - this.props.getResolvedComplains( - statusComplainsUrl(this.props.activeHostel, [ + this.props.getResolvedComplaints( + statusComplaintsUrl(this.props.activeHostel, [ 'resolved', 'unresolved', ]), @@ -99,7 +99,7 @@ class AdminComplains extends Component { ) this.props.getTimeSlots(this.props.activeHostel) this.setState({ - complainsDownloadUrl: complainsDownloadUrl(this.props.activeHostel) + complaintsDownloadUrl: complaintsDownloadUrl(this.props.activeHostel) }) } @@ -139,10 +139,10 @@ class AdminComplains extends Component { }) togglePastIcon = () => { - const pastComplainIcon = this.state.pastComplainIcon - pastComplainIcon === 'angle down' - ? this.setState({ pastComplainIcon: 'angle up' }) - : this.setState({ pastComplainIcon: 'angle down' }) + const pastComplaintIcon = this.state.pastComplaintIcon + pastComplaintIcon === 'angle down' + ? this.setState({ pastComplaintIcon: 'angle up' }) + : this.setState({ pastComplaintIcon: 'angle down' }) } handleChange = (event, { name, value }) => { @@ -205,7 +205,7 @@ class AdminComplains extends Component { this.errCallBack ) }})} - this.props.resolveComplain( + this.props.resolveComplaint( this.state.activeId, body, this.props.activeHostel, @@ -221,13 +221,13 @@ class AdminComplains extends Component { error: false, message: '', }) - this.props.getPendingComplains( - statusComplainsUrl(this.props.activeHostel, ['pending','inprocess']), + this.props.getPendingComplaints( + statusComplaintsUrl(this.props.activeHostel, ['pending','inprocess']), this.pendingSuccessCallBack, this.pendingErrCallBack ) - this.props.getResolvedComplains( - statusComplainsUrl(this.props.activeHostel, [ + this.props.getResolvedComplaints( + statusComplaintsUrl(this.props.activeHostel, [ 'resolved', 'unresolved', ]), @@ -326,8 +326,8 @@ class AdminComplains extends Component { this.setState({ pendingLoading: true }) - this.props.getPendingComplains( - `${statusComplainsUrl(this.props.activeHostel, [ + this.props.getPendingComplaints( + `${statusComplaintsUrl(this.props.activeHostel, [ 'PENDING','INPROCESS' ])}search=${value}`, this.pendingSuccessCallBack, @@ -340,8 +340,8 @@ class AdminComplains extends Component { this.setState({ pastLoading: true }) - this.props.getResolvedComplains( - `${statusComplainsUrl(this.props.activeHostel, [ + this.props.getResolvedComplaints( + `${statusComplaintsUrl(this.props.activeHostel, [ 'RESOLVED', 'UNRESOLVED', ])}search=${value}`, @@ -355,8 +355,8 @@ class AdminComplains extends Component { this.setState({ pendingLoading: true }) - this.props.getPendingComplains( - `${statusComplainsUrl(this.props.activeHostel, [ + this.props.getPendingComplaints( + `${statusComplaintsUrl(this.props.activeHostel, [ 'PENDING','INPROCESS' ])}page=${activePage}`, this.pendingSuccessCallBack, @@ -369,8 +369,8 @@ class AdminComplains extends Component { this.setState({ pastLoading: true }) - this.props.getResolvedComplains( - `${statusComplainsUrl(this.props.activeHostel, [ + this.props.getResolvedComplaints( + `${statusComplaintsUrl(this.props.activeHostel, [ 'RESOLVED', 'UNRESOLVED', ])}&page=${activePage}`, @@ -384,8 +384,8 @@ class AdminComplains extends Component { this.setState({ pendingLoading: true }) - this.props.getPendingComplains( - `${statusComplainsUrl(this.props.activeHostel, [ + this.props.getPendingComplaints( + `${statusComplaintsUrl(this.props.activeHostel, [ 'PENDING','INPROCESS' ])}page=${this.state.activePage}&perPage=${value}`, this.pendingSuccessCallBack, @@ -398,8 +398,8 @@ class AdminComplains extends Component { this.setState({ pastLoading: true }) - this.props.getResolvedComplains( - `${statusComplainsUrl(this.props.activeHostel, [ + this.props.getResolvedComplaints( + `${statusComplaintsUrl(this.props.activeHostel, [ 'RESOLVED', 'UNRESOLVED', ])}&page=${this.state.activeAprPage}&perPage=${value}`, @@ -437,8 +437,8 @@ class AdminComplains extends Component { this.setState({ pendingLoading: true, }) - this.props.getPendingComplains( - `${statusComplainsUrl(this.props.activeHostel, [ + this.props.getPendingComplaints( + `${statusComplaintsUrl(this.props.activeHostel, [ 'PENDING', 'INPROCESS', ])}date=${dateRange}`, @@ -460,8 +460,8 @@ class AdminComplains extends Component { this.setState({ pastLoading: true, }) - this.props.getResolvedComplains( - `${statusComplainsUrl(this.props.activeHostel, [ + this.props.getResolvedComplaints( + `${statusComplaintsUrl(this.props.activeHostel, [ 'RESOLVED', 'UNRESOLVED', ])}date=${dateRange}`, @@ -476,8 +476,8 @@ class AdminComplains extends Component { this.setState({ pendingLoading: true, }) - this.props.getPendingComplains( - `${statusComplainsUrl(this.props.activeHostel, [ + this.props.getPendingComplaints( + `${statusComplaintsUrl(this.props.activeHostel, [ 'PENDING', 'INPROCESS', ])}`, @@ -491,8 +491,8 @@ class AdminComplains extends Component { this.setState({ pastLoading: true, }) - this.props.getResolvedComplains( - `${statusComplainsUrl(this.props.activeHostel, [ + this.props.getResolvedComplaints( + `${statusComplaintsUrl(this.props.activeHostel, [ 'RESOLVED', 'UNRESOLVED', ])}`, @@ -512,9 +512,9 @@ class AdminComplains extends Component { this.setState({ complaint_item }) } - increaseUnsuccesfulComplains = (id) => { + increaseUnsuccesfulComplaints = (id) => { this.props.increaseUnsuccefulAttempts( - increaseUnsuccesfulComplainsUrl(this.props.activeHostel, id), + increaseUnsuccesfulComplaintsUrl(this.props.activeHostel, id), this.resolveSuccessCallBack, this.errCallBack ) @@ -524,7 +524,7 @@ class AdminComplains extends Component { const { open, options, - pastComplainIcon, + pastComplaintIcon, activePage, activeAprPage, pendingLoading, @@ -532,7 +532,7 @@ class AdminComplains extends Component { entryNo, entryAprNo, remark, - complainsDownloadUrl, + complaintsDownloadUrl, residentSearch, residentSearchApr, activeStatus, @@ -541,12 +541,12 @@ class AdminComplains extends Component { pastDatesRange, pastDateFilterActive, } = this.state - const { pendingComplains, resolvedComplains, defaultItems, constants } = this.props + const { pendingComplaints, resolvedComplaints, defaultItems, constants } = this.props let complaint_status_options = []; - for (var i in constants.statues['COMLAINT_STATUSES']) { + for (var i in constants.statues['COMPLAINT_STATUSES']) { complaint_status_options.push({ key: i.toString(), - text: constants.statues['COMLAINT_STATUSES'][i].toString(), + text: constants.statues['COMPLAINT_STATUSES'][i].toString(), value: i.toString(), }); } @@ -554,9 +554,9 @@ class AdminComplains extends Component { -
-
Student Complains and Feedback
-
+
+
Student Complaints and Feedback
+
{dateFilterActive ? ( - + -
+
- Past Complains and Feedback - + Past Complaints and Feedback +
-
+
{pastDateFilterActive ? (
- {pastComplainIcon === 'angle down' && ( + {pastComplaintIcon === 'angle down' && ( {!pastLoading? ( - {(resolvedComplains.results && resolvedComplains.results.length > 0) ? + {(resolvedComplaints.results && resolvedComplaints.results.length > 0) ? (
@@ -823,54 +823,54 @@ class AdminComplains extends Component { Unsuccesful attempts to solve - Complain Status + Complaint Status Items Remark - {resolvedComplains.results && - resolvedComplains.results.length > 0 - ? resolvedComplains.results.map((complain, index) => { + {resolvedComplaints.results && + resolvedComplaints.results.length > 0 + ? resolvedComplaints.results.map((complaint, index) => { return ( {entryAprNo * (activeAprPage - 1) + index + 1} - {complain.description} - {complain.complainant} + {complaint.description} + {complaint.complainant} {moment( - complain.datetimeCreated + complaint.datetimeCreated ).format('DD/MM/YY, hh:mm a')} { constants.complaint_types[ - complain.complaintType + complaint.complaintType ] } - {complain.phoneNumber} - {complain.roomNo} + {complaint.phoneNumber} + {complaint.roomNo} - {complain.failedAttempts} + {complaint.failedAttempts} { - constants.statues.COMLAINT_STATUSES[ - complain.status + constants.statues.COMPLAINT_STATUSES[ + complaint.status ] } - {constants.statues.COMLAINT_STATUSES[complain.status]!='RESOLVED' && complain.remark && + {constants.statues.COMPLAINT_STATUSES[complaint.status]!='RESOLVED' && complaint.remark && <> -
( {complain.remark} ) +
( {complaint.remark} ) } - {complain.items.length > 0 - ? complain.items.map((item,index) => { + {complaint.items.length > 0 + ? complaint.items.map((item,index) => { return( @@ -887,8 +887,8 @@ class AdminComplains extends Component { )} - {complain.remark && complain.remark.trim() != '' - ? complain.remark : 'None'} + {complaint.remark && complaint.remark.trim() != '' + ? complaint.remark : 'None'} ) @@ -899,11 +899,11 @@ class AdminComplains extends Component {
- {resolvedComplains.count > entryAprNo ? ( + {resolvedComplaints.count > entryAprNo ? ( ) : null}
@@ -921,7 +921,7 @@ class AdminComplains extends Component {
): - No resolved complains found + No resolved complaints found } ): @@ -933,7 +933,7 @@ class AdminComplains extends Component { )} - Change complain status? + Change complaint status?
@@ -1002,8 +1002,8 @@ class AdminComplains extends Component { function mapStateToProps(state) { return { - pendingComplains: state.pendingComplains, - resolvedComplains: state.resolvedComplains, + pendingComplaints: state.pendingComplaints, + resolvedComplaints: state.resolvedComplaints, defaultItems: state.defaultItems, timeSlots: state.timeSlots, activeHostel: state.activeHostel @@ -1012,11 +1012,11 @@ function mapStateToProps(state) { const mapDispatchToProps = (dispatch) => { return { - getPendingComplains: (url, successCallBack, errCallBack) => { - dispatch(getPendingComplains(url, successCallBack, errCallBack)) + getPendingComplaints: (url, successCallBack, errCallBack) => { + dispatch(getPendingComplaints(url, successCallBack, errCallBack)) }, - getResolvedComplains: (url, successCallBack, errCallBack) => { - dispatch(getResolvedComplains(url, successCallBack, errCallBack)) + getResolvedComplaints: (url, successCallBack, errCallBack) => { + dispatch(getResolvedComplaints(url, successCallBack, errCallBack)) }, getDefaultItems: (url) => { dispatch(getDefaultItems(url)) @@ -1046,9 +1046,9 @@ const mapDispatchToProps = (dispatch) => { increaseUnsuccefulAttempts: (url, successCallBack, errCallBack) => { dispatch(increaseUnsuccefulAttempts(url, successCallBack, errCallBack)) }, - resolveComplain: (id, data, residence, successCallBack, errCallBack) => { + resolveComplaint: (id, data, residence, successCallBack, errCallBack) => { dispatch( - resolveComplain(id, data, residence, successCallBack, errCallBack) + resolveComplaint(id, data, residence, successCallBack, errCallBack) ) }, addItem: (data, residence, successCallBack, errCallBack) => { @@ -1059,4 +1059,4 @@ const mapDispatchToProps = (dispatch) => { } } -export default connect(mapStateToProps, mapDispatchToProps)(AdminComplains) +export default connect(mapStateToProps, mapDispatchToProps)(AdminComplaints) diff --git a/src/components/app.js b/src/components/app.js index 9f12dd7..ba7e822 100644 --- a/src/components/app.js +++ b/src/components/app.js @@ -8,14 +8,14 @@ import { AppHeader, AppFooter, Loading } from "formula_one" const Nav = lazy(() => import("./navbar/index")) const BookRoom = lazy(() => import("./book_room/index")) -const ComplainRegister = lazy(() => import("./complain_register/index")) +const ComplaintRegister = lazy(() => import("./complaint_register/index")) const Authorities = lazy(() => import("./authorities/index")) const Facilities = lazy(() => import("./facilities/index")) const MyInfo = lazy(() => import("./my_info/index")) const StudentDatabase = lazy(() => import("./student-database/index")) const EventsCard = lazy(() => import("./events-card/index")) const Events = lazy(() => import("./events/index")) -const AdminComplains = lazy(() => import("./admin-complaints/index")) +const AdminComplaints = lazy(() => import("./admin-complaints/index")) const Items = lazy(() => import("./items/index")) const BookingRequests = lazy(() => import("./booking_request/index")) const Facility = lazy(() => import("./facility/index")) @@ -223,9 +223,9 @@ class App extends React.Component { )} /> @@ -263,10 +263,10 @@ class App extends React.Component { } /> ( - { constants['student_council'].includes(activePost) ? ( - - ) : null} @@ -345,7 +345,7 @@ class App extends React.Component { )} /> ( diff --git a/src/components/complain_register/index.css b/src/components/complaint_register/index.css similarity index 100% rename from src/components/complain_register/index.css rename to src/components/complaint_register/index.css diff --git a/src/components/complain_register/index.js b/src/components/complaint_register/index.js similarity index 65% rename from src/components/complain_register/index.js rename to src/components/complaint_register/index.js index ad02462..ef4a258 100644 --- a/src/components/complain_register/index.js +++ b/src/components/complaint_register/index.js @@ -20,47 +20,47 @@ import { Loading } from "formula_one" import './index.css'; -import { getComplains } from '../../actions/complains'; +import { getComplaints } from '../../actions/complaints'; import { addComplaint } from '../../actions/add_complaint'; -import { complainsUrl } from '../../urls'; +import { complaintsUrl } from '../../urls'; import { entries } from '../constants'; -class ComplainRegister extends React.Component { +class ComplaintRegister extends React.Component { constructor(props) { super(props); this.state = { - complain: '', + complaint: '', category: '', loading: false, success: false, error: false, message: '', activePage: 1, - complainsLoading: true, + complaintsLoading: true, entryNo: '5', }; } componentDidMount() { - this.props.setNavigation('Register a Complain'); + this.props.setNavigation('Register a Complaint'); - this.props.getComplains( - `${complainsUrl(this.props.activeHostel)}?me=True`, - this.complainsSuccessCallBack, - this.complainsErrCallBack + this.props.getComplaints( + `${complaintsUrl(this.props.activeHostel)}?me=True`, + this.complaintsSuccessCallBack, + this.complaintsErrCallBack ); } - complainsSuccessCallBack = (res) => { + complaintsSuccessCallBack = (res) => { this.setState({ - complainsLoading: false, + complaintsLoading: false, }) } - complainsErrCallBack = (err) => { + complaintsErrCallBack = (err) => { this.setState({ - complainsLoading: false, + complaintsLoading: false, }) } @@ -71,11 +71,11 @@ class ComplainRegister extends React.Component { }; handlePaginationChange = (e, { activePage }) => { - this.setState({ activePage, complainsLoading: true }); - this.props.getComplains( - `${complainsUrl(this.props.activeHostel)}?page=${activePage}`, - this.complainsSuccessCallBack, - this.complainsErrCallBack + this.setState({ activePage, complaintsLoading: true }); + this.props.getComplaints( + `${complaintsUrl(this.props.activeHostel)}?page=${activePage}`, + this.complaintsSuccessCallBack, + this.complaintsErrCallBack ); }; @@ -84,17 +84,17 @@ class ComplainRegister extends React.Component { this.setState({ pendingLoading: true }) - this.props.getComplains( - `${complainsUrl(this.props.activeHostel)}?page=${this.state.activePage}&perPage=${value}`, - this.complainsSuccessCallBack, - this.complainsErrCallBack + this.props.getComplaints( + `${complaintsUrl(this.props.activeHostel)}?page=${this.state.activePage}&perPage=${value}`, + this.complaintsSuccessCallBack, + this.complaintsErrCallBack ); } handleSubmit = (e) => { let data = { complaintType: this.state.category, - description: this.state.complain.trim(), + description: this.state.complaint.trim(), }; this.setState({ loading: true, @@ -114,14 +114,14 @@ class ComplainRegister extends React.Component { message: res.statusText, loading: false, convenientTime: '', - complain: '', + complaint: '', category: '', - complainsLoading: true, + complaintsLoading: true, }); - this.props.getComplains( - complainsUrl(this.props.activeHostel), - this.complainsSuccessCallBack, - this.complainsErrCallBack + this.props.getComplaints( + complaintsUrl(this.props.activeHostel), + this.complaintsSuccessCallBack, + this.complaintsErrCallBack ); }; @@ -135,8 +135,8 @@ class ComplainRegister extends React.Component { }); }; render() { - const { complains, constants } = this.props; - const { activePage, loading, complainsLoading, complain, category, entryNo } = this.state; + const { complaints, constants } = this.props; + const { activePage, loading, complaintsLoading, complaint, category, entryNo } = this.state; let options = []; for (var i in constants.complaint_types) { options.push({ @@ -150,11 +150,11 @@ class ComplainRegister extends React.Component { {this.state.error && ( - Your complain could not be made. Please try again + Your complaint could not be made. Please try again )} {this.state.success && ( - Your complain has been made succesfully + Your complaint has been made succesfully )} @@ -176,8 +176,8 @@ class ComplainRegister extends React.Component {
Submit -
My Complains and Feedback
+
My Complaints and Feedback
- {!complainsLoading? + {!complaintsLoading? ( - {(complains.results && complains.results.length > 0)? + {(complaints.results && complaints.results.length > 0)? (
@@ -211,38 +211,38 @@ class ComplainRegister extends React.Component { ID Complaint Description - Complain Type - Complain Status - Complain Date and Time + complaint Type + complaint Status + complaint Date and Time Applicant Room - {complains.results && complains.results.length > 0 - ? complains.results.map((complain, index) => { + {complaints.results && complaints.results.length > 0 + ? complaints.results.map((complaint, index) => { return ( {entryNo * (activePage - 1) + index + 1} - {complain.description} + {complaint.description} - {constants.complaint_types[complain.complaintType]} + {constants.complaint_types[complaint.complaintType]} - {constants.statues.COMLAINT_STATUSES[complain.status]} - {constants.statues.COMLAINT_STATUSES[complain.status]!='RESOLVED' && complain.remark && + {constants.statues.COMPLAINT_STATUSES[complaint.status]} + {constants.statues.COMPLAINT_STATUSES[complaint.status]!='RESOLVED' && complaint.remark && <> -
( {complain.remark} ) +
( {complaint.remark} ) } {moment( - complain.datetimeCreated + complaint.datetimeCreated ).format('DD/MM/YY, hh:mm a')} - {complain.roomNo} + {complaint.roomNo} ); }) @@ -252,11 +252,11 @@ class ComplainRegister extends React.Component {
- {complains.count > entryNo ? ( + {complaints.count > entryNo ? ( ) : null}
@@ -275,7 +275,7 @@ class ComplainRegister extends React.Component { ): ( - No Complains or Feedback Yet + No Complaints or Feedback Yet ) } @@ -291,15 +291,15 @@ class ComplainRegister extends React.Component { } function mapStateToProps(state) { return { - complains: state.complains, + complaints: state.complaints, activeHostel: state.activeHostel }; } const mapDispatchToProps = (dispatch) => { return { - getComplains: (url, successCallBack, errCallBack) => { - dispatch(getComplains(url, successCallBack, errCallBack)); + getComplaints: (url, successCallBack, errCallBack) => { + dispatch(getComplaints(url, successCallBack, errCallBack)); }, addComplaint: (data, residence, successCallBack, errCallBack) => { dispatch(addComplaint(data, residence, successCallBack, errCallBack)); @@ -307,4 +307,4 @@ const mapDispatchToProps = (dispatch) => { }; }; -export default connect(mapStateToProps, mapDispatchToProps)(ComplainRegister); +export default connect(mapStateToProps, mapDispatchToProps)(ComplaintRegister); diff --git a/src/components/complains/index.css b/src/components/complaints/index.css similarity index 91% rename from src/components/complains/index.css rename to src/components/complaints/index.css index fe5c49c..28e2483 100644 --- a/src/components/complains/index.css +++ b/src/components/complaints/index.css @@ -1,4 +1,4 @@ -.complain-description { +.complaint-description { display: flex; justify-content: space-between; } diff --git a/src/components/complains/index.js b/src/components/complaints/index.js similarity index 61% rename from src/components/complains/index.js rename to src/components/complaints/index.js index b102eff..aa8e00c 100644 --- a/src/components/complains/index.js +++ b/src/components/complaints/index.js @@ -4,34 +4,34 @@ import { Table, Header, Pagination, Segment, Dropdown } from 'semantic-ui-react' import { Loading } from "formula_one" -import { getComplains } from '../../actions/complains' +import { getComplaints } from '../../actions/complaints' import { addComplaint } from '../../actions/add_complaint' -import { complainsUrl } from '../../urls' +import { complaintsUrl } from '../../urls' import { entries } from '../constants' import moment from 'moment' import './index.css' -class Complains extends React.Component { +class Complaints extends React.Component { state = { - complainAgainID: null, + complaintAgainID: null, activePage: 1, - complainsLoading: true, + complaintsLoading: true, entryNo: '5', } componentDidMount() { - this.props.getComplains( - `${complainsUrl(this.props.activeHostel)}?me=True`, - this.complainsSuccessCallBack, - this.complainsErrCallBack + this.props.getComplaints( + `${complaintsUrl(this.props.activeHostel)}?me=True`, + this.complaintsSuccessCallBack, + this.complaintsErrCallBack ) } handlePaginationChange = (e, { activePage }) => { - this.setState({ activePage, complainsLoading: true }) - this.props.getComplains( - `${complainsUrl(this.props.activeHostel)}?page=${activePage}`, - this.complainsSuccessCallBack, - this.complainsErrCallBack + this.setState({ activePage, complaintsLoading: true }) + this.props.getComplaints( + `${complaintsUrl(this.props.activeHostel)}?page=${activePage}`, + this.complaintsSuccessCallBack, + this.complaintsErrCallBack ) } @@ -40,36 +40,36 @@ class Complains extends React.Component { this.setState({ pendingLoading: true }) - this.props.getComplains( - `${complainsUrl(this.props.activeHostel)}?page=${this.state.activePage}&perPage=${value}`, - this.complainsSuccessCallBack, - this.complainsErrCallBack + this.props.getComplaints( + `${complaintsUrl(this.props.activeHostel)}?page=${this.state.activePage}&perPage=${value}`, + this.complaintsSuccessCallBack, + this.complaintsErrCallBack ) } - complainsSuccessCallBack = (res) => { + complaintsSuccessCallBack = (res) => { this.setState({ - complainsLoading: false, + complaintsLoading: false, }) } - complainsErrCallBack = (err) => { + complaintsErrCallBack = (err) => { this.setState({ - complainsLoading: false, + complaintsLoading: false, }) } render() { - const { complains, constants } = this.props - const { activePage, complainsLoading, entryNo } = this.state + const { complaints, constants } = this.props + const { activePage, complaintsLoading, entryNo } = this.state return ( -
My Complains
- {!complainsLoading? +
My Complaints
+ {!complaintsLoading? ( - {(complains.results && complains.results.length > 0)? + {(complaints.results && complaints.results.length > 0)? (
@@ -78,30 +78,30 @@ class Complains extends React.Component { ID Complaint Description - Complain Type - Complain Status - Complain Date and Time + complaint Type + complaint Status + complaint Date and Time Applicant Room Items Remark - {complains.results && complains.results.length > 0 - ? complains.results.map((complain, index) => { + {complaints.results && complaints.results.length > 0 + ? complaints.results.map((complaint, index) => { return ( {entryNo * (activePage - 1) + index + 1} - {complain.description} - {constants.complaint_types[complain.complaintType]} - {constants.statues.COMLAINT_STATUSES[complain.status]} - {moment(complain.datetimeCreated).format('DD/MM/YY, hh:mm a')} - {complain.roomNo} + {complaint.description} + {constants.complaint_types[complaint.complaintType]} + {constants.statues.COMPLAINT_STATUSES[complaint.status]} + {moment(complaint.datetimeCreated).format('DD/MM/YY, hh:mm a')} + {complaint.roomNo} - {complain.items.length > 0 - ? complain.items.map((item,index) => { + {complaint.items.length > 0 + ? complaint.items.map((item,index) => { return( @@ -119,8 +119,8 @@ class Complains extends React.Component { } - {complain.remark && complain.remark.trim() != '' - ? complain.remark : 'None'} + {complaint.remark && complaint.remark.trim() != '' + ? complaint.remark : 'None'} ) @@ -131,11 +131,11 @@ class Complains extends React.Component {
- {complains.count > entryNo ? ( + {complaints.count > entryNo ? ( ) : null}
@@ -154,7 +154,7 @@ class Complains extends React.Component { ): ( - No Complains made yet + No Complaints made yet ) } @@ -170,15 +170,15 @@ class Complains extends React.Component { function mapStateToProps(state) { return { - complains: state.complains, + complaints: state.complaints, activePage: state.activePage } } const mapDispatchToProps = (dispatch) => { return { - getComplains: (url, successCallBack, errCallBack) => { - dispatch(getComplains(url, successCallBack, errCallBack)) + getComplaints: (url, successCallBack, errCallBack) => { + dispatch(getComplaints(url, successCallBack, errCallBack)) }, addComplaint: () => { dispatch(addComplaint()) @@ -186,4 +186,4 @@ const mapDispatchToProps = (dispatch) => { } } -export default connect(mapStateToProps, mapDispatchToProps)(Complains) +export default connect(mapStateToProps, mapDispatchToProps)(Complaints) diff --git a/src/components/facility/index.js b/src/components/facility/index.js index 45f8f8e..8b08884 100644 --- a/src/components/facility/index.js +++ b/src/components/facility/index.js @@ -225,7 +225,7 @@ class Facility extends React.Component { error: false, message: res.statusText, convenientTime: '', - complain: '', + complaint: '', category: '', information: res.data.description, day: [], @@ -240,7 +240,7 @@ class Facility extends React.Component { error: false, message: res.statusText, convenientTime: '', - complain: '', + complaint: '', category: '', information: res.data.description, day: [], diff --git a/src/components/menubar/index.js b/src/components/menubar/index.js index 48ddf9e..235f6c5 100644 --- a/src/components/menubar/index.js +++ b/src/components/menubar/index.js @@ -6,7 +6,7 @@ import { Icon, Menu } from "semantic-ui-react"; import { homePageUrl, - complainUrl, + complaintUrl, profilePageUrl, bookingUrl, eventUrl @@ -31,9 +31,9 @@ class MenuBar extends Component { }) return } - case complainUrl(): { + case complaintUrl(): { this.setState({ - activeSubGroup: 'complains' + activeSubGroup: 'complaints' }) return } @@ -92,15 +92,15 @@ class MenuBar extends Component { Book a Room - + - Make a Complain + Make a complaint diff --git a/src/components/my_profile/index.js b/src/components/my_profile/index.js index 5659ab8..4251348 100644 --- a/src/components/my_profile/index.js +++ b/src/components/my_profile/index.js @@ -6,12 +6,12 @@ import { Divider, Menu, Grid } from 'semantic-ui-react'; import { getFacilities } from '../../actions/facilities'; import UpcomingBookings from '../upcoming_bookings/index'; import PastBookings from '../past_bookings/index'; -import Complains from '../complains/index'; +import Complaints from '../complaints/index'; import facilities from './index.css'; import blocks from '../../css/app.css'; -import { complainsUrl } from '../../urls'; +import { complaintsUrl } from '../../urls'; class MyProfile extends React.Component { state = { activeItem: 'upcoming' }; @@ -27,7 +27,7 @@ class MyProfile extends React.Component { const { who_am_i, constants } = this.props; return ( - + import("../menubar/index")) import { homePageUrl, - adminComplainUrl, + adminComplaintUrl, itemUrl, bookingUrl, eventUrl, - complainUrl, + complaintUrl, registrationUrl, databaseUrl, roomUrl @@ -66,9 +66,9 @@ class Nav extends Component { }) return } - case adminComplainUrl(): { + case adminComplaintUrl(): { this.setState({ - activeSubGroup: 'complains' + activeSubGroup: 'complaints' }) return } @@ -207,12 +207,12 @@ class Nav extends Component {