Merge branch 'release/1.7.0'

ctsit · Oct 20, 2020 · bcba9cf · bcba9cf
2 parents b3d3cf4 + 8aa5b77
commit bcba9cf
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,16 @@ All notable changes to the Imagemap module will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## [1.7.0] - 2020-10-20
+### Added
+- Add fibromyalgia map (willsvankumc)
+- Add FR_REGION IMAGEMAP (hpotier)
+
+## Changed
+- interrupt an infinite loop on radio buttons in later redcap versions (Kyle Chesney)
+- Fix 'Deselect Issues #52' in later redcap versions (Kyle Chesney)
+
+
 ## [1.6.0] - 2020-08-17
 ### Added
 - Reduce mbody image size by 50% (willsvankumc)

diff --git a/README.md b/README.md
@@ -106,6 +106,15 @@ DO-Touch.NET body region image map designed for use in osteopathic manipulative
 The 66 Swollen / 68 Tender Joint Count can be used to record the number of tender and swollen joints in patients with inflammatory arthritis e.g. psoriatic arthritis, rheumatoid arthritis. These counts can be used in calculated fields to generate disease activity scores in combination with other variables e.g. DAPSA, DAS28 scores.
 ![66SWOLLEN_68TENDER_JOINT_COUNT](./img/66swollen_68tender_joint_count.png)
 
+**`FR_REGION`**
+
+French Region 2020 : to localize in one click a region - Région Française 2020 : Pour localiser en un clic une région.
+![FR_REGION](./img/france_region_nb.png)
+
+**`FIBROMYALGIA_BODY`**
+
+This is a Patient self-report figure for the Assessment of Fibromyalgia.
+![FIBROMYALGIA_BODY](./img/fibromyalgia.png)
 
 ## Usage
 To display one of the images above in a survey or data entry form, add a new field of type **Text Box** and include one of the following options in the **Action Tags / Field Annotation (optional)** field:
@@ -127,6 +136,8 @@ To display one of the images above in a survey or data entry form, add a new fie
 @IMAGEMAP=DO_TOUCH_NET_BODY_COLOUR
 @IMAGEMAP=DO_TOUCH_NET_BODY_GREY
 @IMAGEMAP=66SWOLLEN_68TENDER_JOINT_COUNT
+@IMAGEMAP=FR_REGION
+@IMAGEMAP=FIBROMYALGIA_BODY
 ```
 
 Each region of an image is associated with a key, for example, the "Ankle (front-left)" of the female body diagram is linked to the key "f34". To find a particular key for a body part, please refer to the HTML files (map files) located in the folder `maps`. After selecting multiple body parts, the field containing the action tag `@IMAGEMAP` will have as a value a string of comma-separated keys, e.g. "f36,f17,f18,f21". Similarly, if using the faces diagram, the field containing the action tag (e.g. `@IMAGEMAP=SMILE_SCALE`) will have the value corresponding to the face clicked.
@@ -148,3 +159,5 @@ This project includes an [Example Instrument](docs/Instrument\ Example.zip) that
  * The Michigan Body Map (MBODY) image was created by the Division of Pain Research Anesthesiology of the University of Michigan. Please refer to their [website](https://medicine.umich.edu/dept/pain-research/clinical-research/michigan-body-map-mbm) for copyright information.
  * The DO-Touch.NET body map was created by Jamie Carroll using the international standard for osteopathic manipulative medicine (OMM) research established by DO-Touch.NET. Use of this image map requires the attributions to remain in place. [website](https://www.do-touch.net). Jane Coe Johnson [email protected] assisted Geoffroey-Allen Franklin [email protected] updating information about the DO-Touch.NET image maps.
  * The 66 Swollen / 68 Tender Joint Map was contributed by Dr Tom Lynch from the Institute of Bone and Joint Research, University of Sydney. The image was adopted with permission from Dr Alexis Ogdie-Beatty and first published in this article from the OMERACT group: [website](http://www.jrheum.org/content/early/2019/05/24/jrheum.181089).
+ * The FR_REGION was contributed by Hugo Potier of University Hospital of Nîmes. The image source come from [data.gouv.fr](http://data.gouv.fr).
+ * Fibromyalgia self-report image appears in the article ["Fibromyalgia: A Clinical Review"](https://jamanetwork.com/journals/jama/fullarticle/1860480) by Daniel J. Clauw and is provided by Thomas Van Doorn and Dr. Andrea Nicol. Copyright 2014 American Medical Association. All rights reserved.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.6.0
+1.7.0
diff --git a/config.json b/config.json
@@ -273,6 +273,33 @@
             "height": 614,
             "hideInput": true,
             "map": "maps/66swollen_68tender_joint_count.html"
+        },
+		"FR_REGION": {
+            "name": "fr_region",
+            "alt": "French Region 2020 - Région Française 2020",
+            "desc": "French Region 2020 : to localize in one click a region - Région Française 2020 : Pour localiser en un clic une région.",
+            "options": "1,2,3,4,6,11,24,27,28,32,44,52,53,75,76,84,93,94",
+            "data_dict_default": "1,GUADELOUPE | 2,MARTINIQUE | 3,GUYANE | 4,LA REUNION | 6,MAYOTTE | 11,ILE DE FRANCE | 24,CENTRE VAL DE LOIRE | 27,BOURGOGNE FRANCHE COMTE | 28,NORMANDIE | 32,HAUTS DE FRANCE | 44,GRAND EST | 52,PAYS DE LA LOIRE | 53,BRETAGNE | 75,NOUVELLE AQUITAINE | 76,OCCITANIE | 84,AUVERGNE RHONE ALPES | 93,PROVENCE ALPES COTE D AZUR | 94,CORSE",
+            "image": "img/france_region_nb.png",
+            "width": 765,
+            "height": 701,
+            "hideInput": true,
+			"singleSelect": true,
+            "map": "maps/fr_region.html"
+        },
+        "FIBROMYALGIA_BODY": {
+            "name": "fibromyalgia_body",
+            "alt": "Fibromyalgia Bodymap",
+            "desc": "Bodymap for use in Fibromyalgia research.",
+            "options": "01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19",
+            "data_dict_default": "01, Right jaw | 02, Left jaw | 03, Neck | 04, Right Shoulder | 05, Left Shoulder | 06, Chest or breast | 07, Upper back | 08, Right upper arm | 09, Left upper arm | 10, Abdomen | 11, Lower back | 12, Right lower arm | 13, Left lower arm | 14, Right hip or buttocks | 15, Left hip or buttocks | 16, Right upper leg | 17, Left upper leg | 18, Right lower leg | 19, Left lower leg",
+            "image": "img/fibromyalgia.png",
+            "width": 708,
+            "height": 867,
+            "hideInput": true,
+            "singleSelect": false,
+            "fillColor": "0000cc",
+            "map": "maps/fibromyalgia.html"
         }
     }
 }
diff --git a/docs/Instrument Example.zip b/docs/Instrument Example.zip
diff --git a/img/fibromyalgia.png b/img/fibromyalgia.png
diff --git a/img/france_region_nb.png b/img/france_region_nb.png
diff --git a/js/imagemap.js b/js/imagemap.js
@@ -241,9 +241,11 @@ imageMapEM.loadAreaList = function(field_name) {
 
     // For radio button questions, the main input is here - use it to set value
     $('input[name="'+field_name+'"]', tr).each(function() {
-        $(img).mapster('set',true,$(this).val());
+        let val = $(this).val();
+        if ( $(img).mapster('get') != val ) { // avoid infinite loop
+            $(img).mapster('set',true,val);
+        };
     });
-
 }
 
 // Takes the values from the image map and saves them to the redcap form
@@ -266,7 +268,7 @@ imageMapEM.updateAreaList = function(image, data) {
         var selected = data.selected;
         //imageMapEM.log ('is selected: ' + selected);
         if (checked !== selected) {
-            $(this).click().trigger('onclick');
+            $(this).click();
             //$(this).blur();
         }
     });

diff --git a/maps/fibromyalgia.html b/maps/fibromyalgia.html
@@ -0,0 +1,20 @@
+<!-- Fibromyalgia Body -->
+<area target="" data-key="01" alt="Right jaw" title="Right jaw" href="" coords="353,138,378,164" shape="rect">
+<area target="" data-key="02" alt="Left jaw" title="Left jaw" href="" coords="733,137,758,163" shape="rect">
+<area target="" data-key="03" alt="Neck" title="Neck" href="" coords="505,189,530,215" shape="rect">
+<area target="" data-key="04" alt="Right shoulder" title="Right shoulder" href="" coords="261,231,285,257" shape="rect">
+<area target="" data-key="05" alt="Left shoulder" title="Left shoulder" href="" coords="699,242,723,268" shape="rect">
+<area target="" data-key="06" alt="Chest or breast" title="Chest or breast" href="" coords="344,267,368,293" shape="rect">
+<area target="" data-key="07" alt="Upper back" title="Upper back" href="" coords="813,266,838,292" shape="rect">
+<area target="" data-key="08" alt="Right upper arm" title="Right upper arm" href="" coords="197,347,221,373" shape="rect">
+<area target="" data-key="09" alt="Left upper arm" title="Left upper arm" href="" coords="678,344,703,370" shape="rect">
+<area target="" data-key="10" alt="Abdomen" title="Abdomen" href="" coords="381,408,406,434" shape="rect">
+<area target="" data-key="11" alt="Lower back" title="Lower back" href="" coords="808,444,832,471" shape="rect">
+<area target="" data-key="12" alt="Right lower arm" title="Right lower arm" href="" coords="147,449,172,475" shape="rect">
+<area target="" data-key="13" alt="Left lower arm" title="Left lower arm" href="" coords="625,464,649,490" shape="rect">
+<area target="" data-key="14" alt="Right hip or buttocks" title="Right hip or buttocks" href="" coords="263,543,287,568" shape="rect">
+<area target="" data-key="15" alt="Left hip or buttocks" title="Left hip or buttocks" href="" coords="715,543,740,569" shape="rect">
+<area target="" data-key="16" alt="Right upper leg" title="Right upper leg" href="" coords="282,676,306,702" shape="rect">
+<area target="" data-key="17" alt="Left upper leg" title="Left upper leg" href="" coords="721,673,746,700" shape="rect">
+<area target="" data-key="18" alt="Right lower leg" title="Right lower leg" href="" coords="230,888,255,914" shape="rect">
+<area target="" data-key="19" alt="Left lower leg" title="Left lower leg" href="" coords="738,885,763,911" shape="rect">
diff --git a/maps/fr_region.html b/maps/fr_region.html
@@ -0,0 +1,19 @@
+<!-- Image Map Generated by http://www.image-map.net/ -->
+    <area data-key="1" target="" alt="guadeloupe" title="GUADELOUPE" href="" coords="736,68,731,50,747,41,696,59,711,85,721,80,728,91,715,96,685,55,689,70,685,80,687,97,679,99,672,84,667,75,663,57,663,41,673,42,685,46,692,43,689,31,695,29,704,23,706,37,713,41,719,47,725,49,734,65,736,68" shape="poly">
+    <area data-key="2" target="" alt="martinique" title="MARTINIQUE" href="" coords="725,131,711,131,699,122,687,117,678,117,674,124,680,132,681,142,681,151,695,159,702,157,706,169,697,169,693,176,700,182,707,177,717,180,727,181,724,192,733,181,727,158,722,148,716,139" shape="poly">
+    <area data-key="3" target="" alt="guyane" title="GUYANE" href="" coords="689,210,703,214,718,225,733,236,735,247,727,257,719,271,713,279,706,285,693,280,687,285,676,285,684,274,687,255,680,241,680,224" shape="poly">
+    <area data-key="4" target="" alt="la_reunion" title="LA REUNION" href="" coords="689,303,724,309,733,332,745,341,745,348,742,361,742,377,715,381,697,373,680,364,672,351,665,335,667,325,674,319,674,312" shape="poly">
+    <area data-key="6" target="" alt="mayotte" title="MAYOTTE" href="" coords="715,431,711,440,715,447,710,455,708,463,713,469,702,472,693,465,687,453,702,457,697,447,692,437,692,426,681,418,683,409,676,397,689,401,700,413,706,414,719,418,730,433,732,421" shape="poly">
+    <area data-key="11" target="" alt="ile_de_france" title="ILE DE FRANCE" href="" coords="419,164,424,183,418,198,397,200,396,213,387,218,373,215,368,204,348,206,346,196,334,184,324,154,333,143,338,138,354,141,373,146,382,148,404,146,410,157" shape="poly">
+    <area data-key="24" target="" alt="centre_val_de_loire" title="CENTRE VAL DE LOIRE" href="" coords="324,156,329,171,331,181,339,187,345,195,347,206,358,204,369,206,373,215,386,219,397,214,403,229,397,234,390,245,395,253,390,261,397,287,400,301,400,315,384,321,377,333,365,335,365,342,338,342,317,344,308,345,295,327,280,299,268,302,261,294,251,282,263,253,272,253,279,247,289,239,293,225,293,214,289,203,297,195,291,179,303,172,315,170,321,163" shape="poly">
+    <area data-key="27" target="" alt="bourgogne_franche_comte" title="BOURGOGNE FRANCHE COMTE" href="" coords="550,340,554,326,567,314,567,299,577,293,585,284,593,272,588,265,601,256,593,248,591,240,575,230,556,228,549,223,542,227,533,235,527,244,524,249,514,251,501,253,494,248,489,235,483,226,471,226,460,228,451,230,441,229,432,214,426,212,424,203,417,199,407,199,398,200,396,212,400,220,405,229,398,232,396,238,392,244,395,255,390,258,393,272,396,280,401,294,401,300,400,309,400,315,407,321,418,322,428,319,433,330,445,338,445,348,443,359,460,359,465,350,478,351,485,353,491,336,505,332,518,348,529,344,537,350,544,344" shape="poly">
+    <area data-key="28" target="" alt="normandie" title="NORMANDIE" href="" coords="161,90,178,101,195,94,196,104,192,109,198,124,204,119,230,122,246,131,253,126,267,120,257,114,262,98,278,88,292,86,315,77,324,70,331,82,339,94,334,105,336,118,336,133,331,142,324,156,318,168,308,172,293,173,296,194,291,202,290,212,274,202,267,192,261,192,253,196,240,182,223,188,212,189,197,184,184,187,176,177,187,173,174,162,179,145,176,130,165,116" shape="poly">
+    <area data-key="32" target="" alt="hauts_de_france" title="HAUTS DE FRANCE" href="" coords="383,0,381,14,388,26,401,20,410,32,412,39,424,40,428,56,447,54,455,63,457,77,455,88,451,101,447,114,445,124,437,121,429,129,427,142,424,148,428,154,418,167,403,146,380,150,362,142,336,136,335,104,336,88,323,69,329,66,328,56,333,16,345,9" shape="poly">
+    <area data-key="44" target="" alt="grand_est" title="GRAND EST" href="" coords="606,262,615,261,620,250,618,236,623,223,621,212,622,203,627,192,631,171,645,157,645,148,624,138,607,134,595,138,586,136,579,136,569,129,560,116,545,112,537,117,531,110,517,114,507,99,485,94,483,84,483,69,477,72,471,80,466,85,455,84,453,97,447,108,445,126,436,122,428,127,429,136,430,144,423,149,429,153,427,158,421,166,420,179,419,188,418,200,427,208,427,214,441,228,457,230,477,223,488,230,495,237,496,248,505,251,519,250,527,245,535,232,540,227,558,229,567,227,563,228,589,236,593,243,599,255" shape="poly">
+    <area data-key="52" target="" alt="pays_de_la_loire" title="PAYS DE LA LOIRE" href="" coords="261,193,267,193,271,202,279,207,289,211,293,223,287,241,276,249,261,255,251,283,242,292,221,296,207,296,213,317,218,343,181,344,157,334,149,315,126,313,134,286,143,297,141,282,135,273,122,270,124,262,144,257,148,246,166,244,181,235,189,240,195,225,202,223,199,184,218,192,229,186,241,183,245,190,253,197" shape="poly">
+	<area data-key="53" target="" alt="bretagne" title="BRETAGNE" href="" coords="130,261,145,257,152,243,170,243,180,234,190,241,194,227,201,223,201,204,200,184,192,187,183,189,176,177,164,175,164,168,154,170,144,174,132,171,121,181,102,154,83,156,83,165,68,163,64,168,62,157,55,163,46,165,34,165,23,173,21,183,45,183,40,189,48,195,30,189,30,195,42,202,20,205,35,211,37,225,46,226,53,221,82,234,93,237,99,246,85,266,99,267" shape="poly">
+    <area data-key="75" target="" alt="nouvelle_aquitaine" title="NOUVELLE AQUITAINE" href="" coords="186,350,193,347,204,345,219,345,216,330,214,315,210,304,205,296,217,297,227,292,238,292,245,292,253,285,257,290,262,296,267,305,279,302,285,308,295,320,293,326,301,333,307,344,317,346,328,346,337,341,356,343,365,352,375,361,377,372,372,380,371,388,375,398,372,404,372,418,364,418,363,427,355,438,351,450,343,446,336,452,328,444,319,444,310,461,309,467,294,480,297,490,289,488,291,500,285,512,251,520,233,518,231,526,230,532,227,546,237,556,241,564,242,572,227,585,221,602,205,606,201,593,177,589,171,580,167,586,161,580,167,570,155,566,147,565,142,558,155,552,164,531,171,497,179,464,193,465,185,456,175,464,180,435,185,398,203,414,209,440,215,447,208,418,199,400,182,386,172,363,190,379,189,362,181,357,170,351" shape="poly">
+    <area data-key="76" target="" alt="occitanie" title="OCCITANIE" href="" coords="391,633,374,643,355,636,340,641,332,630,326,619,314,623,305,612,295,610,270,605,269,614,250,614,233,612,223,601,226,585,233,579,241,563,237,554,223,544,232,529,232,520,245,521,259,517,272,513,283,511,289,502,289,488,298,491,291,480,302,472,310,466,313,455,319,443,329,444,335,452,341,449,350,449,356,463,360,472,370,474,377,459,387,452,392,460,396,469,404,457,415,449,423,457,439,461,443,473,451,485,454,496,466,499,477,493,487,504,494,521,484,524,481,537,473,542,473,549,465,558,458,557,454,554,446,557,437,564,426,572,418,571,408,576,403,587,399,598,399,604,399,615,397,624,408,637" shape="poly">
+    <area data-key="84" target="" alt="auvergne_rhone_alpes" title="AUVERGNE RHONE ALPES" href="" coords="584,335,587,344,586,361,597,367,600,373,590,384,597,393,599,401,609,408,609,419,599,427,586,429,579,435,564,435,569,452,548,461,542,467,533,482,522,485,539,503,529,508,519,500,507,497,499,489,495,495,497,500,486,495,476,495,467,497,456,495,447,484,439,461,424,459,420,450,408,450,396,468,389,454,379,456,373,465,370,474,358,471,351,452,356,439,361,427,365,417,373,418,371,407,373,392,371,381,375,367,371,352,362,349,365,337,377,331,381,322,390,319,399,318,407,323,420,323,426,319,434,330,444,339,444,350,444,359,451,358,459,361,465,353,478,352,485,358,491,337,505,333,519,350,529,345,533,351,541,350,549,339,554,345,547,353,546,362,556,358,563,354,561,340" shape="poly">
+    <area data-key="93" target="" alt="provence_alpe_code_d_azur" title="PROVENCE ALPES COTE D AZUR" href="" coords="645,506,643,518,633,521,635,530,628,532,623,539,617,544,608,550,603,557,597,562,590,566,590,573,587,581,579,592,569,593,556,585,547,586,535,581,527,575,520,565,509,571,502,560,493,569,488,569,479,570,479,562,466,558,472,546,481,538,487,524,492,518,484,496,495,502,503,499,499,493,513,500,519,501,531,510,534,506,534,499,529,494,524,485,533,483,534,472,540,470,551,463,564,454,570,454,564,444,568,435,577,437,584,437,594,448,601,454,606,460,605,468,600,472,600,482,601,487,607,495,612,498,618,502,628,502,634,501,642,501" shape="poly">
+    <area data-key="94" target="" alt="corse" title="CORSE" href="" coords="737,571,738,582,737,591,741,599,745,608,749,627,747,637,745,646,740,655,741,669,735,678,735,685,735,695,727,692,721,688,712,683,708,675,704,665,707,656,699,656,702,647,693,639,693,631,695,620,698,609,709,605,719,595,730,597,731,581,729,573" shape="poly">