Skip to content

Commit

Permalink
[media] Remove unused code (aces#3705)
Browse files Browse the repository at this point in the history 
This removes the validFilters and formToFilter variables which are unused when using React.

[Help Editor] Remove unused 'indent' variable (aces#3757)

Added spec/README for conflict resolver module (aces#3375)

This adds a README for the conflict resolver outlining the purpose of the module, following the template set out by the imaging_browser module.

Added ModalWindow Component to Tabs

Added Webpack Config

added scroll on Modal Window

added functionality to Panel

updated composer to be able to use namespaces

added containerIndex to webpack

added Modal Window and Loader

updated ModalWindow

Added Modal Window functionality

updated Modal Window

Updated Modal Window

added functionality to form.js

Altered Database class to allow on duplicate update

update documentation for on duplicate key update

edited Form.js

Made changes to Modal Window

Updated Modal Window

Edited Loader and Media

Rebased

Altered Modal Window and Loader

Removed debugging message

Made changes to filter form and datatable

change loader css

Made changes to Form.js and CSS

Added error props to Form.js

Added JSON Router Dependencies
;

Altered Filter Form to Prevent Infinite Loop

Recompiled JSX
  • Loading branch information
@ridz1208 @HenriRabalais
ridz1208 authored and HenriRabalais committed Oct 7, 2019
1 parent 45b0c6a commit a857617
Show file tree
Hide file tree
Showing 8 changed files with 134 additions and 72 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
"psr-4": {
"LORIS\\": "src/"
},
"classmap": ["project/libraries", "php"]
"classmap": ["project/libraries", "php/libraries", "php/exceptions", "php/interfaces", "modules/biobank/php"]
}
}
14 changes: 2 additions & 12 deletions htdocs/bootstrap/css/custom-css.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,17 +133,8 @@ Note: other colors are currenly inherited from Bootstrap default color palette
/*
* Making the table header font colour white
*/
table th {
color: #064785;
background-color: #E4EBF2;
}

.table > thead > tr > th > a {
color: #064785;
}

.table > thead:first-child > tr:first-child > th {
border-top: 1px solid #C3D5DB;
.table>thead>tr>th>a {
color: #ffffff;
}

/*
Expand Down Expand Up @@ -686,7 +677,6 @@ a.btn.btn-primary:hover {
}

/* Loader customizations */

.loader {
position: relative;
top: 50%;
Expand Down
14 changes: 4 additions & 10 deletions jsx/FilterForm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class FilterForm extends Component {
this.queryString = QueryString.get();
}

componentDidMount() {
componentWillReceiveProps() {
let filter = {};
let queryString = this.queryString;

Expand Down Expand Up @@ -178,15 +178,9 @@ class FilterForm extends Component {
}

return (
<Panel
id={this.props.id}
height={this.props.height}
title={this.props.title}
>
<FormElement {...this.props}>
{formChildren}
</FormElement>
</Panel>
<FormElement {...this.props}>
{formChildren}
</FormElement>
);
}
}
Expand Down
115 changes: 73 additions & 42 deletions jsx/Form.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ class SearchableDropdown extends Component {
className="form-control"
disabled={disabled}
placeholder={this.props.placeHolder}
autoFocus={this.props.autoFocus}
onChange={this.handleChange}
onBlur={this.handleBlur}
required={required}
Expand Down Expand Up @@ -373,6 +374,7 @@ SearchableDropdown.propTypes = {
sortByValue: React.PropTypes.bool,
errorMessage: React.PropTypes.string,
placeHolder: React.PropTypes.string,
autoFocus: React.PropTypes.bool,
onUserInput: React.PropTypes.func
};

Expand All @@ -389,6 +391,7 @@ SearchableDropdown.defaultProps = {
sortByValue: true,
errorMessage: '',
placeHolder: '',
autoFocus: false,
onUserInput: function() {
console.warn('onUserInput() callback is not set');
},
Expand Down Expand Up @@ -432,6 +435,7 @@ class SelectElement extends Component {
let emptyOptionHTML = null;
let requiredHTML = null;
let elementClass = 'row form-group';
let label = null;

// Add required asterisk
if (required) {
Expand All @@ -444,7 +448,7 @@ class SelectElement extends Component {
}

// Add error message
if (this.props.hasError || (this.props.required && this.props.value === '')) {
if (this.props.errorMessage || (this.props.required && this.props.value === "")) {
errorMessage = <span>{this.props.errorMessage}</span>;
elementClass = 'row form-group has-error';
}
Expand Down Expand Up @@ -473,13 +477,19 @@ class SelectElement extends Component {
// Default to empty string for regular select and to empty array for 'multiple' select
const value = this.props.value || (multiple ? [] : '');

return (
<div className={elementClass}>
if (this.props.label) {
label = (
<label className="col-sm-3 control-label" htmlFor={this.props.label}>
{this.props.label}
{requiredHTML}
</label>
<div className="col-sm-9">
);
}

return (
<div className={elementClass}>
{label}
<div className={this.props.inputClass}>
<select
name={this.props.name}
multiple={multiple}
Expand Down Expand Up @@ -510,12 +520,12 @@ SelectElement.propTypes = {
]),
id: React.PropTypes.string,
class: React.PropTypes.string,
inputClass: React.PropTypes.string,
multiple: React.PropTypes.bool,
disabled: React.PropTypes.bool,
required: React.PropTypes.bool,
sortByValue: React.PropTypes.bool,
emptyOption: React.PropTypes.bool,
hasError: React.PropTypes.bool,
errorMessage: React.PropTypes.string,
onUserInput: React.PropTypes.func
};
Expand All @@ -527,13 +537,13 @@ SelectElement.defaultProps = {
value: undefined,
id: null,
class: '',
inputClass: 'col-sm-9',
multiple: false,
disabled: false,
required: false,
sortByValue: true,
emptyOption: true,
hasError: false,
errorMessage: 'The field is required!',
errorMessage: '',
onUserInput: function() {
console.warn('onUserInput() callback is not set');
},
Expand Down Expand Up @@ -904,6 +914,7 @@ class TextboxElement extends Component {
let errorMessage = null;
let requiredHTML = null;
let elementClass = 'row form-group';
let label = null;

// Add required asterix
if (required) {
Expand All @@ -916,13 +927,19 @@ class TextboxElement extends Component {
elementClass = 'row form-group has-error';
}

return (
<div className={elementClass}>
if (this.props.label) {
label = (
<label className="col-sm-3 control-label" htmlFor={this.props.id}>
{this.props.label}
{requiredHTML}
</label>
<div className="col-sm-9">
);
}

return (
<div className={elementClass}>
{label}
<div className={this.props.inputClass}>
<input
type="text"
className="form-control"
Expand Down Expand Up @@ -961,6 +978,7 @@ TextboxElement.defaultProps = {
disabled: false,
required: false,
errorMessage: '',
inputClass: 'col-sm-9',
onUserInput: function() {
console.warn('onUserInput() callback is not set');
},
Expand Down Expand Up @@ -1018,36 +1036,23 @@ class DateElement extends Component {
render() {
let disabled = this.props.disabled ? 'disabled' : null;
let required = this.props.required ? 'required' : null;
let errorMessage = null;
let requiredHTML = null;
let elementClass = 'row form-group';

// Add required asterix
if (required) {
requiredHTML = <span className="text-danger">*</span>;
}

// Check if props minYear and maxYear are valid values if supplied
let minYear = this.props.minYear;
let maxYear = this.props.maxYear;
if (this.props.minYear === '' || this.props.minYear === null) {
minYear = '1000';
}
if (this.props.maxYear === '' || this.props.maxYear === null) {
maxYear = '9999';
}

// Handle date format
let format = this.props.dateFormat;
let inputType = 'date';
let minFullDate = minYear + '-01-01';
let maxFullDate = maxYear + '-12-31';
if (!format.match(/d/i)) {
inputType = 'month';
minFullDate = minYear + '-01';
maxFullDate = maxYear + '-12';
// Add error message
if (this.props.errorMessage) {
errorMessage = <span>{this.props.errorMessage}</span>;
elementClass = 'row form-group has-error';
}

return (
<div className="row form-group">
<div className={elementClass}>
<label className="col-sm-3 control-label" htmlFor={this.props.label}>
{this.props.label}
{requiredHTML}
Expand All @@ -1065,13 +1070,15 @@ class DateElement extends Component {
required={required}
disabled={disabled}
/>
{errorMessage}
</div>
</div>
);
}
}

DateElement.propTypes = {
<<<<<<< 27ae8a8d4f5abc8ad574234df61684695ccb3827
name: PropTypes.string.isRequired,
label: PropTypes.string,
value: PropTypes.string,
Expand All @@ -1082,6 +1089,18 @@ DateElement.propTypes = {
disabled: PropTypes.bool,
required: PropTypes.bool,
onUserInput: PropTypes.func,
=======
name: React.PropTypes.string.isRequired,
label: React.PropTypes.string,
value: React.PropTypes.string,
id: React.PropTypes.string,
maxYear: React.PropTypes.string,
minYear: React.PropTypes.string,
disabled: React.PropTypes.bool,
required: React.PropTypes.bool,
errorMessage: React.PropTypes.func,
onUserInput: React.PropTypes.func
>>>>>>> [media] Remove unused code (#3705)
};

DateElement.defaultProps = {
Expand All @@ -1094,6 +1113,7 @@ DateElement.defaultProps = {
dateFormat: 'YMd',
disabled: false,
required: false,
errorMessage: '',
onUserInput: function() {
console.warn('onUserInput() callback is not set');
},
Expand All @@ -1117,15 +1137,23 @@ class TimeElement extends Component {
render() {
let disabled = this.props.disabled ? 'disabled' : null;
let required = this.props.required ? 'required' : null;
let errorMessage = null;
let requiredHTML = null;
let elementClass = 'row form-group';

// Add required asterix
if (required) {
requiredHTML = <span className="text-danger">*</span>;
}

// Add error message
if (this.props.errorMessage) {
errorMessage = <span>{this.props.errorMessage}</span>;
elementClass = 'row form-group has-error';
}

return (
<div className="row form-group">
<div className={elementClass}>
<label className="col-sm-3 control-label" htmlFor={this.props.label}>
{this.props.label}
{requiredHTML}
Expand All @@ -1143,20 +1171,22 @@ class TimeElement extends Component {
pattern="([0-1][0-9]|2[0-4]|[1-9]):([0-5][0-9])(:([0-5][0-9]))?"
title="Input must be in one of the following formats: HH:MM or HH:MM:SS"
/>
{errorMessage}
</div>
</div>
);
}
}

TimeElement.propTypes = {
name: PropTypes.string.isRequired,
label: PropTypes.string,
value: PropTypes.string,
id: PropTypes.string,
disabled: PropTypes.bool,
required: PropTypes.bool,
onUserInput: PropTypes.func,
name: React.PropTypes.string.isRequired,
label: React.PropTypes.string,
value: React.PropTypes.string,
id: React.PropTypes.string,
disabled: React.PropTypes.bool,
required: React.PropTypes.bool,
errorMessage: React.PropTypes.string,
onUserInput: React.PropTypes.func
};

TimeElement.defaultProps = {
Expand All @@ -1166,6 +1196,7 @@ TimeElement.defaultProps = {
id: '',
disabled: false,
required: false,
errorMessage: '',
onUserInput: function() {
console.warn('onUserInput() callback is not set');
},
Expand Down Expand Up @@ -1399,10 +1430,10 @@ class StaticElement extends Component {
render() {
return (
<div className="row form-group">
<label className="col-sm-3 control-label">
<label className="col-lg-3 control-label">
{this.props.label}
</label>
<div className="col-sm-9">
<div className="col-lg-9">
<p className="form-control-static">{this.props.text}</p>
</div>
</div>
Expand Down Expand Up @@ -1435,10 +1466,10 @@ class LinkElement extends Component {
render() {
return (
<div className="row form-group">
<label className="col-sm-3 control-label">
<label className="col-lg-3 control-label">
{this.props.label}
</label>
<div className="col-sm-9">
<div className="col-lg-9">
<p className="form-control-static"><a href={this.props.href}>{this.props.text}</a></p>
</div>
</div>
Expand Down
Loading

0 comments on commit a857617

Please sign in to comment.