Reservation rate excel report

app/actions/uiActions.js

@@ -3,17 +3,20 @@ import { createActions } from 'redux-actions';
 export default createActions(
   'CHANGE_RESERVATION_SEARCH_FILTERS',
   'CHANGE_RESOURCE_SEARCH_FILTERS',
+  'CHANGE_RESERVATIONS_RATE_REPORT_MODAL_FILTERS',
   'CLEAR_RESOURCE_SELECTOR',
   'HIDE_RESERVATION_CANCEL_MODAL',
   'HIDE_RESERVATION_INFO_MODAL',
   'HIDE_RESERVATION_SUCCESS_MODAL',
   'HIDE_RESOURCE_INFO_MODAL',
   'HIDE_RESOURCE_IMAGES_MODAL',
   'HIDE_RESOURCE_SELECTOR_MODAL',
+  'HIDE_RESERVATIONS_RATE_REPORT_MODAL',
   'SHOW_RESERVATION_CANCEL_MODAL',
   'SHOW_RESERVATION_INFO_MODAL',
   'SHOW_RESERVATION_SUCCESS_MODAL',
   'SHOW_RESOURCE_INFO_MODAL',
   'SHOW_RESOURCE_IMAGES_MODAL',
   'SHOW_RESOURCE_SELECTOR_MODAL',
+  'SHOW_RESERVATIONS_RATE_REPORT_MODAL',
 );

app/api/actionTypes.js

@@ -21,6 +21,7 @@ export default Object.assign(
   create('RESERVATION', ['GET', 'DELETE', 'POST', 'PUT']),
   create('RESERVATION_DETAILS_REPORT', ['GET']),
   create('RESERVATIONS_REPORT', ['GET']),
+  create('RESERVATIONS_RATE_REPORT', ['GET']),
   create('RESERVATIONS', ['GET']),
   create('RESOURCE', ['GET']),
   create('RESOURCE_DAILY_REPORT', ['GET']),

app/api/actions/index.js

@@ -13,6 +13,7 @@ import {
   fetchReservationDetailsReport,
   fetchReservationsReport,
   fetchResourceDailyReport,
+  fetchReservationsRateReport,
 } from './reports';
 import {
   cancelReservation,
@@ -48,6 +49,7 @@ export {
   fetchReservationDetailsReport,
   fetchReservationsReport,
   fetchResourceDailyReport,
+  fetchReservationsRateReport,
   fetchReservation,
   fetchReservations,
   fetchResource,

app/api/actions/reports.js

@@ -6,7 +6,7 @@ function fetchResourceDailyReport({ date, resourceIds }) {
   const day = moment(date).format('YYYY-MM-DD');
   return createReportAction({
     endpoint: 'daily_reservations',
-    filename: `paivaraportti-${day}`,
+    filename: `paivaraportti-${day}.docx`,
     type: 'RESOURCE_DAILY_REPORT',
     params: {
       resource: resourceIds.join(','),
@@ -19,7 +19,7 @@ function fetchResourceDailyReport({ date, resourceIds }) {
 function fetchReservationDetailsReport(reservationId) {
   return createReportAction({
     endpoint: 'reservation_details',
-    filename: `varaus-${reservationId}`,
+    filename: `varaus-${reservationId}.docx`,
     type: 'RESERVATION_DETAILS_REPORT',
     params: {
       reservation: reservationId,
@@ -30,14 +30,24 @@ function fetchReservationDetailsReport(reservationId) {
 function fetchReservationsReport(filters) {
   return createReportAction({
     endpoint: 'reservation_details',
-    filename: 'varaukset',
+    filename: 'varaukset.docx',
     type: 'RESERVATIONS_REPORT',
     params: filters,
   });
 }
 
+function fetchReservationsRateReport(filters) {
+  return createReportAction({
+    endpoint: 'reservation_rate',
+    filename: 'varausasteraportti.xlsx',
+    type: 'RESERVATIONS_RATE_REPORT',
+    params: filters,
+  });
+}
+
 export {
   fetchReservationDetailsReport,
   fetchResourceDailyReport,
   fetchReservationsReport,
+  fetchReservationsRateReport,
 };

app/api/actions/utils.js

@@ -98,7 +98,7 @@ function getSuccessTypeDescriptor(type, options = {}) {
 
 function downloadReport(response, filename) {
   response.blob().then((blob) => {
-    fileSaver.saveAs(blob, `${filename}.docx`);
+    fileSaver.saveAs(blob, filename);
   });
 }
 

app/pages/AppContainer.js

@@ -15,6 +15,7 @@ import {
 import { fetchAuthState } from 'auth/actions';
 import ReservationCancelModal from 'shared/modals/reservation-cancel';
 import ReservationInfoModal from 'shared/modals/reservation-info';
+import ReservationsRateReportModal from 'shared/modals/reservation-rate-report';
 import ReservationSuccessModal from 'shared/modals/reservation-success';
 import ResourceImagesModal from 'shared/modals/resource-images';
 import ResourceInfoModal from 'shared/modals/resource-info';
@@ -55,6 +56,7 @@ export class UnconnectedAppContainer extends Component {
           </Grid>
         </Loader>
         <ReservationInfoModal />
+        <ReservationsRateReportModal />
         <ReservationCancelModal />
         <ResourceImagesModal />
         <ResourceInfoModal />

app/shared/_shared.scss

@@ -11,6 +11,7 @@
 @import './modals/reservation-info/reservation-info';
 @import './modals/reservation-success/reservation-success';
 @import './modals/resource-selector/resource-selector';
+@import './modals/reservation-rate-report/reservation-rate-report';
 @import './navbar/navbar';
 @import './recurring-reservation-controls/recurring-reservation-controls';
 @import './resource-info-button/resource-info-button';

app/shared/availability-view/Sidebar/GroupInfo/AvailabilityViewResourceInfo/AvailabilityViewResourceInfoContainer.js

@@ -12,7 +12,7 @@ AvailabilityViewResourceInfo.propTypes = {
   isFavorite: PropTypes.bool.isRequired,
   isHighlighted: PropTypes.bool,
   name: PropTypes.string.isRequired,
-  peopleCapacity: PropTypes.number.isRequired,
+  peopleCapacity: PropTypes.number,
 };
 export function AvailabilityViewResourceInfo(props) {
   return (

app/shared/availability-view/TimelineGroups/TimelineGroup/AvailabilityTimeline/Reservation.js

@@ -11,8 +11,8 @@ import Link from './Link';
 Reservation.propTypes = {
   begin: PropTypes.string.isRequired,
   end: PropTypes.string.isRequired,
-  visualBegin: PropTypes.object,
-  visualEnd: PropTypes.object,
+  visualBegin: PropTypes.string,
+  visualEnd: PropTypes.string,
   eventSubject: PropTypes.string,
   id: PropTypes.number.isRequired,
   numberOfParticipants: PropTypes.number,

app/shared/form-fields/DateTimeRange.js

@@ -12,6 +12,7 @@ export default class DateTimeRange extends React.Component {
       onBlur: PropTypes.func,
       onChange: PropTypes.func.isRequired,
       required: PropTypes.bool,
+      renderDatePicker: PropTypes.bool,
       value: PropTypes.shape({
         begin: PropTypes.object.isRequired,
         end: PropTypes.object.isRequired,
@@ -55,6 +56,8 @@ export default class DateTimeRange extends React.Component {
 
   render() {
     const value = this.props.controlProps.value;
+    const renderDatePicker = this.props.controlProps.renderDatePicker === undefined
+      ? true : this.props.controlProps.renderDatePicker;
     const requiredPostfix = this.props.controlProps.required ? '*' : '';
     return (
       <div
@@ -64,16 +67,18 @@ export default class DateTimeRange extends React.Component {
         )}
       >
         <div className="date-time-range-field">
-          <Field
-            componentClass={DatePicker}
-            controlProps={{
-              onBlur: this.handleBlur,
-              onChange: this.handleDateChange,
-              value: value.begin.date,
-            }}
-            id={`${this.props.id}-date`}
-            label={this.props.noLabels ? '' : `Päivä${requiredPostfix}`}
-          />
+          {renderDatePicker === true ? (
+            <Field
+              componentClass={DatePicker}
+              controlProps={{
+                onBlur: this.handleBlur,
+                onChange: this.handleDateChange,
+                value: value.begin.date,
+              }}
+              id={`${this.props.id}-date`}
+              label={this.props.noLabels ? '' : `Päivä${requiredPostfix}`}
+            />
+          ) : null}
           <Field
             componentClass={Time}
             controlProps={{

app/shared/form-fields/DateTimeRange.spec.js

@@ -8,15 +8,16 @@ import DateTimeRange from './DateTimeRange';
 import Field from './Field';
 import Time from './Time';
 
+const defaults = {
+  controlProps: {
+    onChange: () => null,
+    value: { begin: {}, end: {} },
+  },
+  id: '1234',
+  noLabels: false,
+};
+
 function getWrapper(props) {
-  const defaults = {
-    controlProps: {
-      onChange: () => null,
-      value: { begin: {}, end: {} },
-    },
-    id: '1234',
-    noLabels: false,
-  };
   return shallow(<DateTimeRange {...defaults} {...props} />);
 }
 
@@ -39,6 +40,18 @@ describe('shared/form-fields/DateTimeRange', () => {
     expect(fields.at(2).prop('componentClass')).to.equal(Time);
   });
 
+  it('does not render datepicker if specified', () => {
+    const fields = getWrapper({
+      controlProps: {
+        ...defaults.controlProps,
+        renderDatePicker: false,
+      },
+    }).find(Field);
+    expect(fields).to.have.length(2);
+    expect(fields.at(0).prop('componentClass')).to.equal(Time);
+    expect(fields.at(1).prop('componentClass')).to.equal(Time);
+  });
+
   it('renders labels only when noLabels = false', () => {
     const fields = getWrapper().find(Field);
     expect(fields.at(0).prop('label')).to.equal('Päivä');