- onChange(obj, parentConditions[parent].fieldsTobeUpdate)({type: 'select'})
-
- if(data === null)
- parentConditions[parent].optionsTobeResets.forEach(func => func([]))
- }
-
- const onChangeParent = object => ({ data }) => {
- const { parent, child } = object
-
- updateValues({ ...object, data})
-
- if(parent !== 'villages' && data !== null) {
- $.ajax({
- type: 'GET',
- url: `/api/${parent}/${data}/${child}`,
- }).success(res => {
- let formatedData = undefined;
- if(parent === 'districts')
- formatedData = groupCommune(res.data)
- else
- formatedData = res.data.map(data => ({ label: data.name || data.name_en, value: data.id }))
-
- const dataState = { districts: setdistricts, communes: setcommunes }
- dataState[child] && dataState[child](formatedData)
- }).error((res) => {
- onerror(res.responseText)
- })
- }
- }
- return (
- outside == true ?
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
- )
-}
+
+
+ );
+};
diff --git a/app/javascript/components/Addresses/thailandAddress.js b/app/javascript/components/Addresses/thailandAddress.js
index 36e6048058..dc046c4443 100644
--- a/app/javascript/components/Addresses/thailandAddress.js
+++ b/app/javascript/components/Addresses/thailandAddress.js
@@ -1,201 +1,303 @@
-import React, { useState, useEffect } from 'react'
-import {
- TextInput,
- SelectInput,
- TextArea
-} from '../Commons/inputs'
+import React, { useState, useEffect } from "react";
+import { TextInput, SelectInput, TextArea } from "../Commons/inputs";
-export default props => {
- const { onChange, disabled, outside, data: { client, currentProvinces, objectKey, objectData, addressTypes, currentDistricts, subDistricts, refereeDistricts, refereeSubdistricts, carerDistricts, carerSubdistricts, T } } = props
-
- const [provinces, setprovinces] = useState(currentProvinces.map(province => ({label: province.name, value: province.id})))
- const [districts, setdistricts] = useState(currentDistricts.map(district => ({label: district.name, value: district.id})))
- const [subdistricts, setSubDistricts] = useState(subDistricts.map(subDistrict => ({ label: subDistrict.name, value: subDistrict.id})))
- const [referee_districts, setRefereeDistricts] = useState(refereeDistricts.map(district => ({label: district.name, value: district.id})))
- const [referee_subdistricts, setRefereeSubDistricts] = useState(refereeSubdistricts.map(subdistrict => ({ label: subdistrict.name, value: subdistrict.id})))
+export default (props) => {
+ const {
+ onChange,
+ disabled,
+ outside,
+ data: {
+ client,
+ currentProvinces,
+ objectKey,
+ objectData,
+ addressTypes,
+ currentDistricts,
+ subDistricts,
+ refereeDistricts,
+ refereeSubdistricts,
+ carerDistricts,
+ carerSubdistricts,
+ T
+ }
+ } = props;
- const [carer_districts, setCarerDistricts] = useState(carerDistricts.map(district => ({label: district.name, value: district.id})))
- const [carer_subdistricts, setCarerSubdistricts] = useState(carerSubdistricts.map(subdistrict => ({ label: subdistrict.name, value: subdistrict.id})))
+ const [provinces, setProvinces] = useState(
+ currentProvinces.map((province) => ({
+ label: province.name,
+ value: province.id
+ }))
+ );
+ const [districts, setDistricts] = useState(
+ currentDistricts.map((district) => ({
+ label: district.name,
+ value: district.id
+ }))
+ );
+ const [subdistricts, setSubDistricts] = useState(
+ subDistricts.map((subDistrict) => ({
+ label: subDistrict.name,
+ value: subDistrict.id
+ }))
+ );
+ const [referee_districts, setRefereeDistricts] = useState(
+ refereeDistricts.map((district) => ({
+ label: district.name,
+ value: district.id
+ }))
+ );
+ const [referee_subdistricts, setRefereeSubDistricts] = useState(
+ refereeSubdistricts.map((subdistrict) => ({
+ label: subdistrict.name,
+ value: subdistrict.id
+ }))
+ );
+ const [carer_districts, setCarerDistricts] = useState(
+ carerDistricts.map((district) => ({
+ label: district.name,
+ value: district.id
+ }))
+ );
+ const [carer_subdistricts, setCarerSubdistricts] = useState(
+ carerSubdistricts.map((subdistrict) => ({
+ label: subdistrict.name,
+ value: subdistrict.id
+ }))
+ );
- const typeOfAddress = addressTypes.map(type => ({ label: T.translate("addressType."+type.label), value: type.value }))
+ const typeOfAddress = addressTypes.map((type) => ({
+ label: T.translate("addressType." + type.label),
+ value: type.value
+ }));
useEffect(() => {
- setdistricts(currentDistricts.map(district => ({label: district.name, value: district.id})))
- setSubDistricts(subDistricts.map(subDistrict => ({ label: subDistrict.name && subDistrict.name, value: subDistrict.id})))
+ setDistricts(
+ currentDistricts.map((district) => ({
+ label: district.name,
+ value: district.id
+ }))
+ );
+ setSubDistricts(
+ subDistricts.map((subDistrict) => ({
+ label: subDistrict.name && subDistrict.name,
+ value: subDistrict.id
+ }))
+ );
+ }, [currentDistricts, subDistricts]);
- }, [currentDistricts, subDistricts])
-
- const updateValues = object => {
- const { parent, child, field, obj, data } = object
+ const updateValues = (object) => {
+ const { parent, child, field, obj, data } = object;
const parentConditions = {
- 'provinces': {
- fieldsTobeUpdate: { district_id: null, subdistrict_id: null, [field]: data },
- optionsTobeResets: [setdistricts, setSubDistricts]
+ provinces: {
+ fieldsToBeUpdate: {
+ district_id: null,
+ subdistrict_id: null,
+ [field]: data
+ },
+ optionsToBeResets: [setDistricts, setSubDistricts]
},
- 'districts': {
- fieldsTobeUpdate: { subdistrict_id: null, [field]: data },
- optionsTobeResets: [setSubDistricts]
+ districts: {
+ fieldsToBeUpdate: { subdistrict_id: null, [field]: data },
+ optionsToBeResets: [setSubDistricts]
},
- 'subdistricts': {
- fieldsTobeUpdate: { [field]: data },
- optionsTobeResets: []
+ subdistricts: {
+ fieldsToBeUpdate: { [field]: data },
+ optionsToBeResets: []
}
- }
+ };
- onChange(obj, parentConditions[parent].fieldsTobeUpdate)({type: 'select'})
-
- if(data === null)
- parentConditions[parent].optionsTobeResets.forEach(func => func([]))
- }
-
- const onChangeParent = object => ({ data }) => {
- const { parent, child, obj } = object
-
- updateValues({ ...object, data})
-
- if(parent !== 'subdistricts' && data !== null) {
- $.ajax({
- type: 'GET',
- url: `/api/${parent}/${data}/${child}`,
- }).success(res => {
- let dataState = {}
- const formatedData = res.data.map(data => ({ label: data.name, value: data.id }))
- switch (obj) {
- case 'referee':
- dataState = { districts: setRefereeDistricts, subdistricts: setRefereeSubDistricts }
- break;
- case 'carer':
- dataState = { districts: setCarerDistricts, subdistricts: setCarerSubdistricts }
- break;
- default:
- dataState = { districts: setdistricts, subdistricts: setSubDistricts }
- }
- dataState[child](formatedData)
- }).error((res) => {
- onerror(res.responseText)
- })
- }
- }
+ onChange(
+ obj,
+ parentConditions[parent].fieldsToBeUpdate
+ )({ type: "select" });
+
+ if (data === null)
+ parentConditions[parent].optionsToBeResets.forEach((func) => func([]));
+ };
+
+ const onChangeParent =
+ (object) =>
+ ({ data }) => {
+ const { parent, child, obj } = object;
+
+ updateValues({ ...object, data });
+
+ if (parent !== "subdistricts" && data !== null) {
+ $.ajax({
+ type: "GET",
+ url: `/api/${parent}/${data}/${child}`
+ })
+ .success((res) => {
+ let dataState = {};
+ const formatedData = res.data.map((data) => ({
+ label: data.name,
+ value: data.id
+ }));
+ switch (obj) {
+ case "referee":
+ dataState = {
+ districts: setRefereeDistricts,
+ subdistricts: setRefereeSubDistricts
+ };
+ break;
+ case "carer":
+ dataState = {
+ districts: setCarerDistricts,
+ subdistricts: setCarerSubdistricts
+ };
+ break;
+ default:
+ dataState = {
+ districts: setDistricts,
+ subdistricts: setSubDistricts
+ };
+ }
+ dataState[child](formatedData);
+ })
+ .error((res) => {
+ onerror(res.responseText);
+ });
+ }
+ };
const handleDistrictOptions = (obj, district) => {
- const is_district = district == 'district'
+ const is_district = district == "district";
switch (obj) {
- case 'referee':
+ case "referee":
return is_district ? referee_districts : referee_subdistricts;
break;
- case 'carer':
+ case "carer":
return is_district ? carer_districts : carer_subdistricts;
break;
default:
return is_district ? districts : subdistricts;
}
- }
-
- return (
- outside == true ?
-
- :
- <>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ };
+
+ return outside == true ? (
+
+ ) : (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
-
- )
-}
+
+
+ );
+};
diff --git a/app/javascript/components/Commons/Loading.js b/app/javascript/components/Commons/Loading.js
index 97e7e441bf..ebbcfbefb9 100644
--- a/app/javascript/components/Commons/Loading.js
+++ b/app/javascript/components/Commons/Loading.js
@@ -1,21 +1,19 @@
-import React from 'react'
-import LoadingScreen from 'react-loading-screen'
+import React from "react";
+import LoadingScreen from "react-loading-screen";
-const Loading = props => {
- const { text, loading, ...others } = props
+const Loading = (props) => {
+ const { text, loading, ...others } = props;
return (
- <>
-
- )
-}
+ />
+ );
+};
-export default Loading
\ No newline at end of file
+export default Loading;
diff --git a/app/javascript/components/Commons/inputs/checkbox.js b/app/javascript/components/Commons/inputs/checkbox.js
index b3beb16415..80481b4055 100644
--- a/app/javascript/components/Commons/inputs/checkbox.js
+++ b/app/javascript/components/Commons/inputs/checkbox.js
@@ -1,44 +1,59 @@
-import React from 'react'
-import Checkbox from 'react-simple-checkbox'
+import React from "react";
+import Checkbox from "react-simple-checkbox";
-export default props => {
- const { onChange, disabled = false, objectKey,inlineClassName, ...others } = props
+export default (props) => {
+ const {
+ onChange,
+ disabled = false,
+ objectKey,
+ inlineClassName,
+ ...others
+ } = props;
const handleLabelStyle = () => {
- return objectKey == 'referee' ? styles.fontBold : styles.font
- }
+ return objectKey == "referee" ? styles.fontBold : styles.font;
+ };
return (
- <>
+
disabled ? '' : onChange({data: boolean, type: 'checkbox'})}
+ onChange={(boolean) =>
+ disabled ? "" : onChange({ data: boolean, type: "checkbox" })
+ }
{...others}
/>
-
- { inlineClassName && }
-
- )
-}
+
+ {inlineClassName && (
+
+ )}
+
+ );
+};
const styles = {
- font:{
- fontWeight: 'normal',
- fontSize: '14px'
+ font: {
+ fontWeight: "normal",
+ fontSize: "14px"
},
- fontBold:{
- fontWeight: 'bold',
- fontSize: '14px'
+ fontBold: {
+ fontWeight: "bold",
+ fontSize: "14px"
},
disabled: {
- color: '#a6a6a6',
- fontWeight: 'normal',
- fontSize: '14px'
+ color: "#a6a6a6",
+ fontWeight: "normal",
+ fontSize: "14px"
}
-}
+};
diff --git a/app/javascript/components/Commons/inputs/checkboxGroup.js b/app/javascript/components/Commons/inputs/checkboxGroup.js
new file mode 100644
index 0000000000..ad0046f824
--- /dev/null
+++ b/app/javascript/components/Commons/inputs/checkboxGroup.js
@@ -0,0 +1,108 @@
+import React from "react";
+
+export default (props) => {
+ const {
+ onChange,
+ disabled = false,
+ objectKey,
+ data,
+ dataValue,
+ name,
+ inlineClassName,
+ required,
+ isError,
+ ...others
+ } = props;
+
+ const findCheckedValue = (value) => {
+ const objIndex = dataValue.findIndex((obj) => obj.value === value);
+
+ return eval(dataValue[objIndex]?.checked) || false;
+ };
+
+ return (
+
+
+
+ {data.map(({ label, checked }, index) => {
+ return (
+ -
+
+
+ );
+ })}
+
+
+ );
+};
+
+const styles = {
+ font: {
+ fontWeight: "normal",
+ fontSize: "14px",
+ marginBottom: "0px"
+ },
+
+ fontBold: {
+ fontWeight: "bold",
+ fontSize: "14px",
+ marginBottom: "0px"
+ },
+
+ disabled: {
+ color: "#a6a6a6",
+ fontWeight: "normal",
+ fontSize: "14px"
+ },
+ checkbox: {
+ display: "inline-block",
+ cursor: "pointer",
+ position: "relative",
+ margin: "0px 5px 0px 0px",
+ width: "19px",
+ height: "19px",
+ outline: "none",
+ filter: "hue-rotate(285deg)"
+ },
+ alignItem: {
+ margin: "5px",
+ padding: "5px",
+ alignItems: "center",
+ display: "flex"
+ }
+};
+
+const customError = {
+ control: (provided) => ({
+ ...provided,
+ borderColor: "red"
+ }),
+ errorText: {
+ color: "red"
+ }
+};
diff --git a/app/javascript/components/Commons/inputs/date.js b/app/javascript/components/Commons/inputs/date.js
index 5b89e880d1..0ac0eeab08 100644
--- a/app/javascript/components/Commons/inputs/date.js
+++ b/app/javascript/components/Commons/inputs/date.js
@@ -15,6 +15,7 @@ export default (props) => {
T,
hintText,
inlineClassName,
+ disabled,
...others
} = props;
const [currentDate, setDate] = useState(value);
@@ -45,7 +46,7 @@ export default (props) => {
};
return (
-
+
+### Open Source Case-management and Record-keeping.
+
+[](https://travis-ci.com/DevZep/oscar-web)
+[](https://travis-ci.com/DevZep/oscar-web)
+[](https://travis-ci.com/DevZep/oscar-web)
+
+### Requirements
+
+- Docker Desktop (latest stable version for your platform)
+
+### Getting Started
+
+Given that we are using Docker, then most common development tasks you will just need the _core services_ which are essentially the OSCaR App Service (Rails) and the OSCaR Database Service (Postgres). To spin these services up only, use the following `make` command:
+
+```
+make start_core
+```
+
+This starts a Rails, Postgres and Webpack container. If you need the Mongo container running then execute the following command in a separate terminal:
+
+```
+make start_mongo
+```
+
+See the project [Makefile](./Makefile) for a list of all the available commands.
+
+Once the containers have fired up open a web browser and navigate to [http://localhost:3000](http://localhost:3000) to open the app. To login, click on the 'dev' organizations logo (there should only be the one logo) and the username (email) is any of the users (listed in the 'users' sheet) of the [lib/devdata/dev_tenant.xlsx](lib/devdata/dev_tenant.xlsx) spreadsheet with the password set to `123456789`.
+
+_NOTE_ If this is the first time you have run this you may need to stop the containers and run it again!
+
+## Debugging using Pry
+
+If you want to debug the Rails application using Pry you need to attach to the container running Rails first. To do that in a new terminal window run:
+
+```
+make rails_attach
+```
+
+Now when your code runs and gets to the `binding.pry` line it will halt and a Pry REPL session will be available in the terminal window where you are attached.
+
+When you have finished dubugging just type `exit` in the Pry REPL session as you normally would. Keep this terminal attached for convenience if you need to use Pry again.
+
+NOTE: To detach the tty **without also terminating the Rails container**, you need to use the escape sequence **Ctrl+P** followed by **Ctrl+Q**.
+
+## Troubleshooting
+
+#### Issue pending migrations when starting Docker container
+
+If you have pending migrations that **prevent the Docker container from starting** for example:
+
+```
+app | You have 2 pending migrations:
+app | 20200603071312 ________
+app | 20200603081325 ________
+app | Run `rake db:migrate` to update your database then try again.
+app exited with code 1
+```
+
+Then you can fix this by running the following command and then starting services again.
+
+```
+make db_migrate
+```
| Master Branch | Stable Branch | Staging Branch |
| ------------------------------------------------------------------------------------------------------------------- | :-----------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------: |
diff --git a/_options b/_options
deleted file mode 100644
index cdc0a7ab46..0000000000
--- a/_options
+++ /dev/null
@@ -1,71 +0,0 @@
-=> [[31m[1;31m"[0m[31mgiven_name[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mfamily_name[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mlocal_given_name[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mlocal_family_name[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mfamily[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mslug[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mschool_name[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mother_info_of_exit[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mexit_note[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mmain_school_contact[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mwhat3words[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mkid_id[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mcode[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mclient_contact_phone[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mclient_email_address[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mhouse_number[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mstreet_number[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mreferee_name[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mreferee_phone[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mreferee_email[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mcarer_name[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mcarer_phone[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mcarer_email[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mlocation_of_concern[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mcreated_by[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mgender[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mstatus[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31magency_name[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mreceived_by_id[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mreferral_source_id[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mfollowed_up_by_id[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mhas_been_in_government_care[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mhas_overdue_assessment[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mhas_overdue_forms[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mhas_overdue_task[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mno_case_note[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mhas_been_in_orphanage[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31muser_id[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mdonor_name[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mactive_program_stream[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31menrolled_program_stream[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mcase_note_type[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mexit_reasons[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mexit_circumstance[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mrated_for_id_poor[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mprovince_id[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mdistrict_id[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mbirth_province_id[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mcommune_id[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mvillage_id[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mreferred_to[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mreferred_from[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mreferral_source_category_id[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mtype_of_service[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mreferee_relationship[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31maddress_type[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mphone_owner[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mfamily_id[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mage[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mtime_in_cps[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mtime_in_ngo[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mdate_of_birth[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31minitial_referral_date[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mfollow_up_date[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mexit_date[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31maccepted_date[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mcase_note_date[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mcreated_at[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mdate_of_referral[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mactive_clients[1;31m"[0m[31m[0m,
- [31m[1;31m"[0m[31mcare_plan_completed_date[1;31m"[0m[31m[0m]
diff --git a/app/assets/images/chat_error.png b/app/assets/images/chat_error.png
new file mode 100644
index 0000000000..84711902da
Binary files /dev/null and b/app/assets/images/chat_error.png differ
diff --git a/app/assets/images/error_page_not_found.png b/app/assets/images/error_page_not_found.png
new file mode 100644
index 0000000000..89ea27bfa9
Binary files /dev/null and b/app/assets/images/error_page_not_found.png differ
diff --git a/app/assets/images/header_icon.png b/app/assets/images/header_icon.png
new file mode 100644
index 0000000000..1892e78562
Binary files /dev/null and b/app/assets/images/header_icon.png differ
diff --git a/app/assets/images/indonesia.png b/app/assets/images/indonesia.png
new file mode 100644
index 0000000000..dc848ced92
Binary files /dev/null and b/app/assets/images/indonesia.png differ
diff --git a/app/assets/javascripts/advanced_filter_builder.coffee b/app/assets/javascripts/advanced_filter_builder.coffee
index 131937fe6e..85f8c334b1 100644
--- a/app/assets/javascripts/advanced_filter_builder.coffee
+++ b/app/assets/javascripts/advanced_filter_builder.coffee
@@ -132,7 +132,7 @@ class CIF.AdvancedFilterBuilder
rules = $("a[data-save-search-#{advancedSearchId}]").data("save-search-#{advancedSearchId}")
$('button.client-advance-search').click()
self.handleAddHotlineFilter()
- $('.program-stream-column li.visibility, .hotline-call-column li.visibility').each ->
+ $('.program-stream-column li.visibility, .hotline-call-column li.visibility, .assessment-column li.visibility').each ->
fieldCheckedBoxValue = $($(this).find('input')[0]).val()
values = self.getSaveSearchFields(rules.rules)
$($(this).find('input')[0]).iCheck('check') if values.includes(fieldCheckedBoxValue)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index b517172cd4..338596880c 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -133,6 +133,7 @@
//= require prevent_required_file_uploader
//= require format_special_characters
//= require referrals/form
+//= require referrals/show
//= require government_forms/form
//= require multiple_form/form
//= require registrations/form
@@ -150,3 +151,4 @@
//= require internal_referrals/form
//= require service_receives/form
//= require screening_assessments/form
+//= require custom_data/form
diff --git a/app/assets/javascripts/application_with_pack.js b/app/assets/javascripts/application_with_pack.js
index 9b3f02faae..1e7f19d205 100644
--- a/app/assets/javascripts/application_with_pack.js
+++ b/app/assets/javascripts/application_with_pack.js
@@ -58,5 +58,4 @@
//= require clients/index
//= require report_creator
//= require clients/show
-//= require clients/form
//= require clients/book
diff --git a/app/assets/javascripts/assessments/form.coffee b/app/assets/javascripts/assessments/form.coffee
index 7c8bfad766..b32f5f9843 100644
--- a/app/assets/javascripts/assessments/form.coffee
+++ b/app/assets/javascripts/assessments/form.coffee
@@ -14,6 +14,24 @@ CIF.AssessmentsNew = CIF.AssessmentsEdit = CIF.AssessmentsCreate = CIF.Assessmen
_saveAssessment(form)
_initICheckBox()
+ $("#assessment_assessment_date").on "change", _submitFormViaAjax
+
+ saveTimer = null
+ $(".assessment_assessment_domains_reason textarea").on "keyup", ->
+ clearTimeout saveTimer
+ saveTimer = setTimeout _submitFormViaAjax, 1000
+
+ _submitFormViaAjax = ->
+ if $("form.assessment-form").data("autosave")
+ $.ajax
+ url: $("form.assessment-form").attr("action") + "&draft=true"
+ type: "PUT"
+ data: $("form.assessment-form").serialize()
+ dataType: "json"
+ success: (response) ->
+ if response.edit_url
+ history.replaceState(null, "", response.edit_url)
+
_initICheckBox = ->
$('.i-checks').iCheck
checkboxClass: 'icheckbox_square-green'
@@ -82,9 +100,13 @@ CIF.AssessmentsNew = CIF.AssessmentsEdit = CIF.AssessmentsCreate = CIF.Assessmen
scoreColor = $(@).parents('.score_option').data("score-#{score}")
domainId = $(@).parents('.score_option').data("domain-id")
+ $('.score_option input').removeClass('error')
+ $('.score_option em').remove()
$(@).addClass("btn-secondary")
$($(@).siblings().get(-1)).val(score)
+ _submitFormViaAjax()
+
$('.score_option input').attr('required','required')
$('.col-xs-12').on 'click', '.score_option label', ->
@@ -147,7 +169,8 @@ CIF.AssessmentsNew = CIF.AssessmentsEdit = CIF.AssessmentsCreate = CIF.Assessmen
return
onStepChanging: (event, currentIndex, newIndex) ->
- console.log 'onStepChanging'
+ return true if newIndex < currentIndex
+
currentTab = "#{rootId}-p-#{currentIndex}"
domainId = $("#{currentTab}").find('.score_option').data('domain-id')
@@ -160,7 +183,6 @@ CIF.AssessmentsNew = CIF.AssessmentsEdit = CIF.AssessmentsCreate = CIF.Assessmen
_filedsValidator(currentIndex, newIndex)
onStepChanged: (event, currentIndex, priorIndex) ->
- console.log 'onStepChanged'
currentTab = "#{rootId}-p-#{currentIndex}"
domainId = $("#{currentTab}").find('.score_option').data('domain-id')
currentStep = $("#{rootId}-p-" + currentIndex)
@@ -181,7 +203,6 @@ CIF.AssessmentsNew = CIF.AssessmentsEdit = CIF.AssessmentsCreate = CIF.Assessmen
form.validate().settings.ignore = ':disabled'
form.valid()
-
_filedsValidator(currentIndex, newIndex)
onFinished: ->
@@ -302,12 +323,20 @@ CIF.AssessmentsNew = CIF.AssessmentsEdit = CIF.AssessmentsCreate = CIF.Assessmen
$("#{task} .task_name_help, #{task} .task_completion_date_help").hide()
_initUploader = ->
- $('.file .optional').fileinput
- showUpload: false
- removeClass: 'btn btn-danger btn-outline'
- browseLabel: 'Browse'
- theme: "explorer"
- allowedFileExtensions: ['jpg', 'png', 'jpeg', 'doc', 'docx', 'xls', 'xlsx', 'pdf']
+ $fileInputs = $('.file .optional')
+
+ $.each $fileInputs, (index, fileInput) ->
+ $(fileInput).fileinput
+ uploadAsync: false
+ removeClass: 'btn btn-danger btn-outline'
+ browseLabel: 'Browse'
+ theme: "explorer"
+ allowedFileExtensions: ['jpg', 'png', 'jpeg', 'doc', 'docx', 'xls', 'xlsx', 'pdf']
+ uploadUrl: $(fileInput).closest(".assessment-domain-item").data("uploadAttachmentUrl")
+
+ $(fileInput).on "filebatchselected", (event, files) ->
+ $(this).fileinput("upload")
+ return
_handleDeleteAttachment = ->
rows = $('.row-file')
diff --git a/app/assets/javascripts/care_plans/form.coffee b/app/assets/javascripts/care_plans/form.coffee
index a8d809b705..4301683ae4 100644
--- a/app/assets/javascripts/care_plans/form.coffee
+++ b/app/assets/javascripts/care_plans/form.coffee
@@ -1,6 +1,6 @@
CIF.Care_plansNew = CIF.Care_plansEdit = CIF.Care_plansCreate = CIF.Care_plansUpdate = do ->
_init = ->
- forms = $('form.care_plan-form')
+ forms = $('form.care_plan-form, #previous-care-plan' )
for form in forms
_loadSteps($(form))
@@ -99,9 +99,8 @@ CIF.Care_plansNew = CIF.Care_plansEdit = CIF.Care_plansCreate = CIF.Care_plansUp
form.submit()
_disableRequiredFields = ->
- formid = $('form.care_plan-form').attr('id')
- form = $('#'+formid)
- form.data("disableRequiredFields")
+ form = $('#previous-care-plan')
+ form.data("disable-required-fields")
_taskRequiredField = (currentTab) ->
$("#{currentTab}").find('.task-input-field')[0] && $("#{currentTab}").find('.task-input-field')[0].value
diff --git a/app/assets/javascripts/case_notes/form.coffee b/app/assets/javascripts/case_notes/form.coffee
index d6a912ab45..d3027a2770 100644
--- a/app/assets/javascripts/case_notes/form.coffee
+++ b/app/assets/javascripts/case_notes/form.coffee
@@ -16,6 +16,38 @@ CIF.Case_notesNew = CIF.Case_notesCreate = CIF.Case_notesEdit = CIF.Case_notesUp
_taskProgressNoteToggle()
_initTaskProgressNoteTooltip()
+
+ $("#case_note_meeting_date").on "change", _submitFormViaAjax
+ $("#case_note_interaction_type").on "change", _submitFormViaAjax
+ $("#case_note_domain_group_ids").on "change", ->
+ _submitFormViaAjax()
+
+ saveTimer = null
+
+ $("#case_note_attendee").on "keyup", ->
+ clearTimeout saveTimer
+ saveTimer = setTimeout _submitFormViaAjax, 1000
+
+ $("#case_note_note").on "keyup", ->
+ clearTimeout saveTimer
+ saveTimer = setTimeout _submitFormViaAjax, 1000
+
+ _submitFormViaAjax = ->
+ if $("#case-note-form").data("autosave")
+ $(".task-arising.task-item-wrapper").addClass("saved")
+
+ $.ajax
+ url: $("#case-note-form").attr("action") + "&draft=true"
+ type: "PUT"
+ data: $("#case-note-form").serialize()
+ dataType: "json"
+ success: (response) ->
+ if response.edit_url
+ history.replaceState(null, "", response.edit_url)
+
+ $.each $(".task-arising.task-item-wrapper.saved"), (index, element) ->
+ $(element).find("input[name='task[]']").remove()
+
_initICheckBox = ->
$('.i-checks').iCheck(
checkboxClass: 'icheckbox_square-green'
@@ -83,11 +115,17 @@ CIF.Case_notesNew = CIF.Case_notesCreate = CIF.Case_notesEdit = CIF.Case_notesUp
_initUploader = ->
$('.file .optional').fileinput
- showUpload: false
removeClass: 'btn btn-danger btn-outline'
browseLabel: 'Browse'
theme: "explorer"
+ uploadAsync: false
allowedFileExtensions: ['jpg', 'png', 'jpeg', 'doc', 'docx', 'xls', 'xlsx', 'pdf']
+ uploadUrl: $("#case-note-form").data("uploadUrl")
+
+ $('.file .optional').on "filebatchselected", (event, files) ->
+ $(this).fileinput("upload")
+ return
+
_handleDeleteAttachment = ->
rows = $('.row-file')
@@ -157,6 +195,7 @@ CIF.Case_notesNew = CIF.Case_notesCreate = CIF.Case_notesEdit = CIF.Case_notesUp
$('#tasksFromModal').modal('hide')
_hideShowOnGoingTaskLable()
_hideAddNewTask()
+ _submitFormViaAjax()
else
_showError(taskName, taskDate)
$('.add-task-btn').removeAttr('disabled')
@@ -178,7 +217,7 @@ CIF.Case_notesNew = CIF.Case_notesCreate = CIF.Case_notesEdit = CIF.Case_notesUp
if $(".task-domain-#{domainId}").hasClass('hidden')
$(".task-domain-#{domainId}").removeClass('hidden')
- $("#tasks-domain-#{domainId} .task-arising").removeClass('hidden')
+ $("#tasks-domain-#{domainId} .task-arising").removeClass('hidden').addClass("task-item-wrapper")
$("#tasks-domain-#{domainId} .task-arising ol").append(element)
$(".panel-tasks-domain-#{domainId}").removeClass('hidden')
@@ -295,7 +334,8 @@ CIF.Case_notesNew = CIF.Case_notesCreate = CIF.Case_notesEdit = CIF.Case_notesUp
_hideAddNewTask = ->
_checkCasenoteSelectedValue($('#case_note_domain_group_ids'))
$.each $('#case_note_domain_group_ids').select2('data'), (index, object) ->
- $("#domain-#{object.id}").show() if $("#domain-#{object.id} .task-arising .list-group > li").length > 0
+ if $("#domain-#{object.id} .task-arising .list-group > li").length > 0 || $("#domain-#{object.id} input[data-task-id]").length > 0
+ $("#domain-#{object.id}").show()
$.each $('.case-note-domain-group'), (index, object)->
if $("##{object.id}").find('span.checkbox').length > 0
diff --git a/app/assets/javascripts/client_advance_search.coffee b/app/assets/javascripts/client_advance_search.coffee
index 429f566e5d..471df34d7b 100644
--- a/app/assets/javascripts/client_advance_search.coffee
+++ b/app/assets/javascripts/client_advance_search.coffee
@@ -95,8 +95,10 @@ class CIF.ClientAdvanceSearch
initSelect2: ->
- $('#custom-form-select, #wizard-custom-form-select, #program-stream-select, #wizard-program-stream-select, #quantitative-case-select, #assessment-select').select2()
+ $('#custom-form-select, #wizard-custom-form-select, #program-stream-select, #wizard-program-stream-select, #quantitative-case-select').select2()
$('#builder select').select2()
+ $('#assessment-select').select2()
+
$('#wizard-builder select').select2()
setTimeout ( ->
ids = ['#custom-form-select', '#wizard-custom-form-select', '#program-stream-select', '#wizard-program-stream-select', '#quantitative-case-select', '#wizard-builder', '#builder', '#assessment-select']
@@ -116,6 +118,57 @@ class CIF.ClientAdvanceSearch
$(".csi-group .rule-operator-container select, .rule-value-container select").select2(width: 'resolve')
)
+ self = @
+
+ $('#assessment-select').on 'change', (e)->
+ $(".assessment-data-dropdown li").addClass("hide")
+ self.showAssessmentColumns("")
+
+ value = $('#assessment-select').select2('data') && $('#assessment-select').select2('data').id
+ $(".assessment-data-dropdown li.csi-#{value}").removeClass("hide")
+ $("input[id$='_advanced_search_assessment_selected']").val("[#{value}]")
+
+ self.showAssessmentColumns($('#assessment-select option:selected').data("selectGroup"))
+
+ unless $("#assessment-checkbox").is(":checked")
+ $(".assessment-data-dropdown li").addClass("hide")
+ $("input[id$='_advanced_search_assessment_selected']").val("[]")
+ self.showAssessmentColumns("")
+
+ $('#assessment-select').trigger('change')
+
+ showAssessmentColumns: (sectionText) ->
+ self = @
+
+ # Toggle domain score fields
+ $.each $('#assessment-select option'), (index, item) ->
+ $options = $("optgroup[label='#{$(item).data("selectGroup")}'] option")
+
+ if $(item).data("selectGroup") == sectionText
+ $options.attr("disabled", false)
+ else
+ $options.attr("disabled", "disabled")
+
+ # Toggle custom assessment fields
+ $options = $("optgroup[label='Custom Assessment'] option")
+
+ if sectionText != undefined && sectionText.indexOf(" | ") > -1
+ $options.attr("disabled", false)
+ else
+ $options.attr("disabled", "disabled")
+
+ $('#builder select').select2(width: '250px')
+
+ $('#builder select').on 'select2-open', (e)->
+ setTimeout ( ->
+ self.hideDisabledGroup()
+ ), 50
+
+
+ hideDisabledGroup: ->
+ $(".select2-result-with-children").each ->
+ $(@).hide() if $(@).find(".select2-disabled").length > 0
+
basicFilterSetRule: ->
self = @
basicQueryRules = $('#builder').data('basic-search-rules')
@@ -153,8 +206,13 @@ class CIF.ClientAdvanceSearch
assessmentSelectChange: ->
self = @
+ assessmentSelectValue = $('#assessment-select').find(':selected').val()
+ $("div[data-custom-assessment-setting-id='#{assessmentSelectValue}']").show() if $("#assessment-checkbox").is(":checked")
+
$('.main-report-builder .assessment-form-wrapper select').on 'select2-selecting', (element) ->
- self.assessmentSelected = element.val
+ $(".custom-assessment-setting").hide()
+ $(".custom-assessment-setting input[type='checkbox']").iCheck("uncheck")
+ $("div[data-custom-assessment-setting-id='#{element.val}']").show()
addCustomBuildersFields: (ids, url, loader=undefined) ->
self = @
@@ -246,19 +304,31 @@ class CIF.ClientAdvanceSearch
ruleFiltersSelect = $('.main-report-builder .rule-container .rule-filter-container select')
ruleFiltersSelect.select2('destroy')
ruleFiltersSelect.parents('.rule-container').find('.rule-header button').trigger('click')
- self.assessmentSelected = ''
+
+ $(".custom-assessment-setting input[type='checkbox']").iCheck("uncheck")
+ $('.assessment-column a.dropdown-toggle').addClass('disabled')
+
+ $(".custom-assessment-setting").hide()
+
$('.assessment-form').hide()
$('#builder').queryBuilder('removeFilter', ['assessment_condition_last_two','assessment_condition_first_last'])
$('button[data-add="rule"]').trigger('click')
- self.initSelect2()
+
return
handleShowAssessmentSelect: ->
self = @
if $('#assessment-checkbox').prop('checked')
$('.assessment-form').show()
+
$('#assessment-checkbox').on 'ifChecked', ->
$('.assessment-form').show()
+ assessmentSelectValue = $('#assessment-select').find(':selected').val()
+
+ $('.assessment-column a.dropdown-toggle').removeClass('disabled')
+ # self.initSelect2()
+
+ $("div[data-custom-assessment-setting-id='#{assessmentSelectValue}']").show()
self.assessmentSelected = $('select.assessment-select').val()
$.ajax
url: self.PROGRAM_STREAM_URL
@@ -300,6 +370,7 @@ class CIF.ClientAdvanceSearch
assessmentSelectRemove: ->
self = @
$('.main-report-builder .assessment-form-wrapper select').on 'select2-removed', (element) ->
+ $(".custom-assessment-setting").hide()
$.map self.assessmentSelected, (val, i) ->
if parseInt(val) == parseInt(element.val) then self.assessmentSelected.splice(i, 1)
@@ -735,7 +806,7 @@ class CIF.ClientAdvanceSearch
programStreamAssociation = $('.main-report-builder .program-association')
$(programStreamAssociation).find('.i-checks').iCheck('uncheck')
$(programStreamAssociation).hide()
-
+
if self.programSelected.length == 0
self.removeActiveClientProgramOption()
@@ -858,63 +929,87 @@ class CIF.ClientAdvanceSearch
return
######################################################################################################################
+ prepareSearchParams: (btnID) ->
+ self = @
+
+ if btnID == 'search'
+ builderElement = '#builder'
+ builderForm = '.main-report-builder'
+ programValues = if self.programSelected.length > 0 then "[#{self.programSelected}]"
+ customFormValues = if self.customFormSelected.length > 0 then "[#{self.customFormSelected}]"
+ else
+ builderElement = '#wizard-builder'
+ builderForm = '#report-builder-wizard'
+ programValues = if self.wizardProgramSelected.length > 0 then "[#{self.wizardProgramSelected}]"
+ customFormValues = if self.wizardCustomFormSelected.length > 0 then "[#{self.wizardCustomFormSelected}]"
+
+ basicRules = $(builderElement).queryBuilder('getRules', { skip_empty: true, allow_invalid: true })
+
+ if $('#builder').queryBuilder('getSQL', false, true)
+ sql_sting = $('#builder').queryBuilder('getSQL', false, true).sql
+ $('#raw_sql').val(sql_sting)
+
+ self.setValueToProgramAssociation()
+ $('#client_advanced_search_custom_form_selected').val(customFormValues)
+ $('#client_advanced_search_program_selected').val(programValues)
+
+ if $('#quantitative-type-checkbox').prop('checked') then $('#client_advanced_search_quantitative_check').val(1)
+ if $('#wizard_quantitative_filter').prop('checked') then $('#client_advanced_search_wizard_quantitative_check').val(1)
+ if $('#wizard_custom_form_filter').prop('checked') then $('#client_advanced_search_wizard_custom_form_check').val(1)
+ if $('#wizard_program_stream_filter').prop('checked') then $('#client_advanced_search_wizard_program_stream_check').val(1)
+ if $('#wizard-enrollment-checkbox').prop('checked') then $('#client_advanced_search_wizard_enrollment_check').val(1)
+ if $('#wizard-tracking-checkbox').prop('checked') then $('#client_advanced_search_wizard_tracking_check').val(1)
+ if $('#wizard-exit-form-checkbox').prop('checked') then $('#client_advanced_search_wizard_exit_form_check').val(1)
+ $('#client_advanced_search_action_report_builder, #family_advanced_search_action_report_builder').val(builderElement)
+
+ if (_.isEmpty(basicRules.rules) and !basicRules.valid) or (!(_.isEmpty(basicRules.rules)) and basicRules.valid)
+ $(builderElement).find('.has-error').removeClass('has-error')
+ $('#client_advanced_search_basic_rules').val(self.handleStringfyRules(basicRules))
+
+ true
+ else
+ false
+
handleSearch: ->
self = @
$('#search, #wizard-search').on 'click', (e)->
btnID = e.currentTarget.id
+
if btnID == 'search'
- builderElement = '#builder'
builderForm = '.main-report-builder'
- programValues = if self.programSelected.length > 0 then "[#{self.programSelected}]"
- customFormValues = if self.customFormSelected.length > 0 then "[#{self.customFormSelected}]"
- assessmentValues = if self.assessmentSelected.length > 0 then "[#{self.assessmentSelected}]"
else
- builderElement = '#wizard-builder'
builderForm = '#report-builder-wizard'
- programValues = if self.wizardProgramSelected.length > 0 then "[#{self.wizardProgramSelected}]"
- customFormValues = if self.wizardCustomFormSelected.length > 0 then "[#{self.wizardCustomFormSelected}]"
-
- basicRules = $(builderElement).queryBuilder('getRules', { skip_empty: true, allow_invalid: true })
-
- if $('#builder').queryBuilder('getSQL', false, true)
- sql_sting = $('#builder').queryBuilder('getSQL', false, true).sql
- $('#raw_sql').val(sql_sting)
-
- self.setValueToProgramAssociation()
- $('#client_advanced_search_custom_form_selected').val(customFormValues)
- $('#client_advanced_search_program_selected').val(programValues)
- $('#client_advanced_search_assessment_selected').val(assessmentValues)
- if $('#quantitative-type-checkbox').prop('checked') then $('#client_advanced_search_quantitative_check').val(1)
- if $('#wizard_quantitative_filter').prop('checked') then $('#client_advanced_search_wizard_quantitative_check').val(1)
- if $('#wizard_custom_form_filter').prop('checked') then $('#client_advanced_search_wizard_custom_form_check').val(1)
- if $('#wizard_program_stream_filter').prop('checked') then $('#client_advanced_search_wizard_program_stream_check').val(1)
- if $('#wizard-enrollment-checkbox').prop('checked') then $('#client_advanced_search_wizard_enrollment_check').val(1)
- if $('#wizard-tracking-checkbox').prop('checked') then $('#client_advanced_search_wizard_tracking_check').val(1)
- if $('#wizard-exit-form-checkbox').prop('checked') then $('#client_advanced_search_wizard_exit_form_check').val(1)
- $('#client_advanced_search_action_report_builder, #family_advanced_search_action_report_builder').val(builderElement)
- if (_.isEmpty(basicRules.rules) and !basicRules.valid) or (!(_.isEmpty(basicRules.rules)) and basicRules.valid)
- $(builderElement).find('.has-error').removeClass('has-error')
- $('#client_advanced_search_basic_rules').val(self.handleStringfyRules(basicRules))
+ if self.prepareSearchParams(btnID)
self.handleSelectFieldVisibilityCheckBox(builderForm)
$('#advanced-search').submit()
- handleFamilySearch: ->
+
+ prepareFamilySearch: ->
self = @
- $('#search').on 'click', ->
- basicRules = $('#builder').queryBuilder('getRules', { skip_empty: true, allow_invalid: true })
+ basicRules = $('#builder').queryBuilder('getRules', { skip_empty: true, allow_invalid: true })
# customFormValues = "[#{$('#family-advance-search-form').find('#custom-form-select').select2('val')}]"
- customFormValues = if self.customFormSelected.length > 0 then "[#{self.customFormSelected}]"
- programValues = if self.programSelected.length > 0 then "[#{self.programSelected}]"
+ customFormValues = if self.customFormSelected.length > 0 then "[#{self.customFormSelected}]"
+ programValues = if self.programSelected.length > 0 then "[#{self.programSelected}]"
+
+ self.setValueToFamilyProgramAssociation()
+ $('#family_advanced_search_custom_form_selected').val(customFormValues)
+ $('#family_advanced_search_program_selected').val(programValues)
+ if $('#quantitative-type-checkbox').prop('checked') then $('#family_advanced_search_quantitative_check').val(1)
+
+ if (_.isEmpty(basicRules.rules) and !basicRules.valid) or (!(_.isEmpty(basicRules.rules)) and basicRules.valid)
+ $('#builder').find('.has-error').removeClass('has-error')
+ console.log(self.handleStringfyRules(basicRules))
+ $('#family_advanced_search_basic_rules').val(self.handleStringfyRules(basicRules))
+ return true
+ else
+ return false
- self.setValueToFamilyProgramAssociation()
- $('#family_advanced_search_custom_form_selected').val(customFormValues)
- $('#family_advanced_search_program_selected').val(programValues)
- if $('#quantitative-type-checkbox').prop('checked') then $('#family_advanced_search_quantitative_check').val(1)
+ handleFamilySearch: ->
+ self = @
- if (_.isEmpty(basicRules.rules) and !basicRules.valid) or (!(_.isEmpty(basicRules.rules)) and basicRules.valid)
- $('#builder').find('.has-error').removeClass('has-error')
- $('#family_advanced_search_basic_rules').val(self.handleStringfyRules(basicRules))
+ $('#search').on 'click', ->
+ if self.prepareFamilySearch()
self.handleSelectFieldVisibilityCheckBox()
$('#advanced-search').submit()
diff --git a/app/assets/javascripts/clients/index.coffee b/app/assets/javascripts/clients/index.coffee
index 8893923be4..f94cd92d4a 100644
--- a/app/assets/javascripts/clients/index.coffee
+++ b/app/assets/javascripts/clients/index.coffee
@@ -1,4 +1,4 @@
-CIF.ClientsIndex = do ->
+CIF.ClientsIndex = CIF.ClientsWelcome = do ->
_init = ->
window.customGroup = {}
content = $('#content').val()
@@ -57,8 +57,9 @@ CIF.ClientsIndex = do ->
_reloadFilter()
_addTourTip(tour)
_extendDataTableSort()
+ _loadStatisticsData()
+ _loadClientTableSummary()
_addDataTableToAssessmentScoreData()
- _addDataTableToTableSummary()
_removeReferralDataColumnsInWizardClientColumn()
_handleShowCustomFormSelect()
_reOrderRuleContainer()
@@ -66,22 +67,24 @@ CIF.ClientsIndex = do ->
_initClientColumnFilter()
_initClientColumnFilter = ->
- searchBox = $('.client-column ul.columns-visibility #column-search-box')
+ searchBox = $('ul.columns-visibility .column-search-box')
searchBox.keyup ->
valThis = $(this).val().toLowerCase()
+
if valThis == ''
- $('.client-column ul.columns-visibility > li').show()
+ $('ul.columns-visibility li').show()
else
- $('.client-column ul.columns-visibility > li:not(:first-child)').each ->
- text = $(this).text().toLowerCase()
+ $('ul.columns-visibility li:not(:first-child)').each ->
+ text = $(this).find("label").text().toLowerCase().trim()
+
if text.indexOf(valThis) >= 0 then $(this).show() else $(this).hide()
return
return
- $('.client-column ul.columns-visibility .btn-clear-text').click ->
+ $('ul.columns-visibility .btn-clear-text').click ->
searchBox.val ''
searchBox.focus()
- $('.client-column ul.columns-visibility > li').show()
+ $('ul.columns-visibility li').show()
return
_reOrderRuleContainer = ->
@@ -112,10 +115,56 @@ CIF.ClientsIndex = do ->
'formatted-num-desc': (a, b) ->
b - a
+ _loadClientTableSummary = ->
+ if $("#client-table-summary-tab-content").length > 0
+ advanceFilter = new CIF.ClientAdvanceSearch()
+ advanceFilter.prepareSearchParams("search")
+
+ $.ajax
+ type: 'POST'
+ dataType: 'json'
+ url: "/clients/load_client_table_summary"
+ data:
+ cache_key: $("#cache-key").data("cacheKey")
+ basic_rules: $("#client_advanced_search_basic_rules").val()
+ success: (data) ->
+ $("#client-table-summary-tab-content").html(data.client_table_content)
+ _addDataTableToTableSummary()
+
+ _loadStatisticsData = ->
+ if $("#program-statistic.searched").length > 0
+ advanceFilter = new CIF.ClientAdvanceSearch()
+ advanceFilter.prepareSearchParams("search")
+
+ $.ajax
+ type: 'POST'
+ dataType: 'json'
+ url: "/clients/load_statistics_data"
+ data:
+ cache_key: $("#cache-key").data("cacheKey")
+ basic_rules: $("#client_advanced_search_basic_rules").val()
+ success: (data) ->
+ $('#cis-domain-score').data 'csi-domain', data.csi_statistics
+ $('#program-statistic').data 'program-statistic', data.enrollments_statistics
+
+ _handleCreateCsiDomainReport()
+ _handleCreateCaseReport()
+
_addDataTableToAssessmentScoreData = ->
- fileName = $('.assessment-domain-score').data('filename')
- _handleAjaxRequestToAssessment("#csi-assessment-score", fileName) if $("#csi-assessment-score").length
- _handleAjaxRequestToAssessment("#custom-assessment-score", fileName) if $("#custom-assessment-score").length
+ if $("body#clients-welcome").length > 0 || $("body#families-welcome").length > 0 || !$("#assessment-checkbox").is(":checked")
+ return
+
+ advanceFilter = new CIF.ClientAdvanceSearch()
+ advanceFilter.prepareSearchParams("search")
+
+ _handleAjaxRequestToAssessment("#csi-assessment-score", $("#assessment-domain-score").data("filename"))
+
+ $('#assessment-select option').each ->
+ $option = $(this)
+
+ if $option.val() && $option.val() != 0
+ _handleAjaxRequestToAssessment("#custom-assessment-score-#{$option.val()}", $("#custom-assessment-domain-score-#{$option.val()}").data("filename"), true)
+
$('.assessment-domain-score').on 'shown.bs.modal', (e) ->
$($.fn.dataTable.tables(true)).DataTable().columns.adjust()
return
@@ -124,6 +173,8 @@ CIF.ClientsIndex = do ->
fileName = $('.table-summary').data('filename')
_handleDataTable("#table-summary-age", fileName)
_handleDataTable("#table-summary-referral-category", fileName)
+ _handleDataTable("#table-summary-school", fileName)
+ _handleDataTable("#table-summary-location", fileName)
$('.table-summary').on 'shown.bs.modal', (e) ->
$($.fn.dataTable.tables(true)).DataTable().columns.adjust()
return
@@ -140,6 +191,9 @@ CIF.ClientsIndex = do ->
sServerMethod: 'POST'
ajax:
url: url
+ data:
+ cache_key: $("#cache-key").data("cacheKey")
+ basic_rules: $("#client_advanced_search_basic_rules").val()
error: (jqXHR, textStatus, errorThrown) ->
console.log("Datatable Ajax Error:", errorThrown)
oLanguage: {
@@ -462,10 +516,10 @@ CIF.ClientsIndex = do ->
$("button[data-target='#client-search-form']").trigger('click')
_hideClientFilters = ->
- dataFilters = $('#client-search-form .datagrid-filter')
- displayColumns = '#client_grid_given_name, #client_grid_family_name, #client_grid_gender, #client_grid_slug, #client_grid_status, #client_grid_user_id'
- $(dataFilters).hide()
- $(dataFilters).children("#{displayColumns}").parents('.datagrid-filter').show()
+ # dataFilters = $('#client-search-form .datagrid-filter')
+ # displayColumns = '#client_grid_given_name, #client_grid_family_name, #client_grid_gender, #client_grid_slug, #client_grid_status, #client_grid_user_id'
+ # $(dataFilters).hide()
+ # $(dataFilters).children("#{displayColumns}").parents('.datagrid-filter').show()
_toggleCollapseFilter = (tour) ->
$('#client-search-form').on 'show.bs.collapse', ->
@@ -488,6 +542,8 @@ CIF.ClientsIndex = do ->
_hideClientFilters()
_initAdavanceSearchFilter = ->
+ return unless $('#client-builder-fields').length > 0
+
advanceFilter = new CIF.ClientAdvanceSearch()
advanceFilter.initBuilderFilter('#client-builder-fields')
advanceFilter.setValueToBuilderSelected()
@@ -594,7 +650,7 @@ CIF.ClientsIndex = do ->
report.lineChart()
_enableSelect2 = ->
- $('#clients-index select').select2
+ $('select').select2
minimumInputLength: 0,
allowClear: true
@@ -611,8 +667,6 @@ CIF.ClientsIndex = do ->
$('#client-statistic').click ->
paramsAdvancedSearch = $('#params').val()
if paramsAdvancedSearch != ''
- _handleCreateCsiDomainReport()
- _handleCreateCaseReport()
_toggleCollapseOnOff()
else
if $('#cis-domain-score').is('[data-csi-domain]') && $('#program-statistic').is('[data-program-statistic]')
diff --git a/app/assets/javascripts/clients/show.coffee b/app/assets/javascripts/clients/show.coffee
index a50ae67732..e3b88fc81d 100644
--- a/app/assets/javascripts/clients/show.coffee
+++ b/app/assets/javascripts/clients/show.coffee
@@ -17,7 +17,6 @@ CIF.ClientsShow = do ->
_initialEnterNGOAcceptedDate()
_handleEnterNGOModalShow()
-
$('table.families').dataTable
'bPaginate': false
'bFilter': false
diff --git a/app/assets/javascripts/common.coffee b/app/assets/javascripts/common.coffee
index e00eb9e307..3b226936b0 100644
--- a/app/assets/javascripts/common.coffee
+++ b/app/assets/javascripts/common.coffee
@@ -13,6 +13,21 @@ CIF.Common =
@iCheckClearOptionSelect()
@printDiv()
+ @loadNotification()
+ @loadSideMenuCountBadge()
+
+ loadNotification: ->
+ setTimeout (->
+ if $('.lazy-load-notification').length > 0
+ $.ajax(type: 'GET', url: '/dashboards/notification')
+ ), 1000
+
+ loadSideMenuCountBadge: ->
+ setTimeout (->
+ if $('ul#side-menu').length > 0
+ $.ajax(type: 'GET', url: '/dashboards/side_menu_data')
+ ), 1000
+
preventEditOnDatePicker: ->
$('.date-picker').datepicker
autoclose: true,
@@ -22,7 +37,7 @@ CIF.Common =
startDate: '1899,01,01',
orientation: 'bottom',
todayBtn: true
- .attr('readonly', 'true').css('background-color','#ffffff').keypress (e) ->
+ .attr('readonly', 'true').attr("autocomplete", "off").css('background-color','#ffffff').keypress (e) ->
if e.keyCode == 8
e.preventDefault()
return
@@ -54,7 +69,8 @@ CIF.Common =
$('#manage').trigger('click')
if navThirdActive.length > 0
setTimeout (->
- $('#pro-nav').trigger('click')
+ if $(navThirdActive).closest(".nav-third-level").prev("a")
+ $(navThirdActive).closest(".nav-third-level").prev("a").trigger('click')
), 400
hideDynamicOperator: ->
@@ -163,4 +179,4 @@ CIF.Common =
$('.printable-button').on 'click', ->
printableId = $(@).data('printable-id')
$("##{printableId}").print()
- return
\ No newline at end of file
+ return
diff --git a/app/assets/javascripts/communities/form.coffee b/app/assets/javascripts/communities/form.coffee
index 0dfabd3b2f..6ebea27039 100644
--- a/app/assets/javascripts/communities/form.coffee
+++ b/app/assets/javascripts/communities/form.coffee
@@ -194,42 +194,25 @@ CIF.CommunitiesNew = CIF.CommunitiesCreate = CIF.CommunitiesEdit = CIF.Communiti
$(e.currentTarget).trigger("validate")
_ajaxChangeDistrict = ->
- mainAddress = $('#community_province_id, #community_district_id, #community_commune_id')
+ mainAddress = $('#community_province_id, #community_city_id, #community_district_id, #community_commune_id')
+ resourceMapping = { cities: 'community_city_id', districts: 'community_district_id', subdistricts: 'community_subdistrict_id', communes: 'community_commune_id', villages: 'family_village_id' }
mainAddress.on 'change', ->
type = $(@).data('type')
typeId = $(@).val()
- subAddress = $(@).data('subaddress')
+ subAddresses = $(@).data('subaddresses')
+ subResource = subAddresses[0]
- if type == 'provinces'
- subResources = 'districts'
- subAddress = switch subAddress
- when 'district' then $('#community_district_id')
-
- $(subAddress).val(null).trigger('change')
- $(subAddress).find('option[value!=""]').remove()
- else if type == 'districts'
- subResources = 'communes'
- subAddress = switch subAddress
- when 'commune' then $('#community_commune_id')
-
- $(subAddress).val(null).trigger('change')
- $(subAddress).find('option[value!=""]').remove()
- else if type == 'communes'
- subResources = 'villages'
- subAddress = switch subAddress
- when 'village' then $('#community_village_id')
-
-
- $(subAddress).val(null).trigger('change')
- $(subAddress).find('option[value!=""]').remove()
+ $(subAddresses || []).each (index, subAddress) =>
+ $("##{resourceMapping[subAddress]}").val(null).trigger('change')
+ $("##{resourceMapping[subAddress]}").find('option[value!=""]').remove()
if typeId != ''
$.ajax
method: 'GET'
- url: "/api/#{type}/#{typeId}/#{subResources}"
+ url: "/api/#{type}/#{typeId}/#{subResource}"
dataType: 'JSON'
success: (response) ->
for address in response.data
- subAddress.append("")
+ $("##{resourceMapping[subResource]}").append("")
{ init: _init }
diff --git a/app/assets/javascripts/communities/index.coffee b/app/assets/javascripts/communities/index.coffee
index 7be98421ff..b83e576dbc 100644
--- a/app/assets/javascripts/communities/index.coffee
+++ b/app/assets/javascripts/communities/index.coffee
@@ -1,4 +1,4 @@
-CIF.CommunitiesIndex = do ->
+CIF.CommunitiesIndex = CIF.CommunitiesWelcome = do ->
_init = ->
_initSelect2()
_initCheckbox()
diff --git a/app/assets/javascripts/custom_data/form.coffee b/app/assets/javascripts/custom_data/form.coffee
new file mode 100644
index 0000000000..2f59c657c2
--- /dev/null
+++ b/app/assets/javascripts/custom_data/form.coffee
@@ -0,0 +1,52 @@
+CIF.Custom_dataNew = CIF.Custom_dataCreate = CIF.Custom_dataEdit = CIF.Custom_dataUpdate = do ->
+ _init = ->
+ _initFormBuilder()
+
+ _initFormBuilder = ->
+ builderOption = new CIF.CustomFormBuilder()
+ specialCharacters = { '&': '&', '<': '<', '>': '>', "&qoute;": '"' }
+ fields = $('.build-wrap').data('fields') || []
+ format = new CIF.FormatSpecialCharacters()
+ fields = format.formatSpecialCharacters(fields, specialCharacters)
+
+ formBuilder = $('.build-wrap').formBuilder
+ templates: separateLine: (fieldData) ->
+ { field: '