Merge branch 'develop'

CSETWebApi/CSETWeb_Api/CSETWeb_Api/CSETWeb_Api.csproj

@@ -3415,6 +3415,8 @@
     <Content Include="Documents\htmlhelp\drex_analysis_screen_control_3.png" />
     <Content Include="Documents\htmlhelp\drex_analysis_screen_control_4.png" />
     <Content Include="Documents\htmlhelp\drex_analysis_screen_control_5.png" />
+    <Content Include="Documents\htmlhelp\drex_analysis_screen_custom.png" />
+    <Content Include="Documents\htmlhelp\drex_analysis_screen_custom_2.png" />
     <Content Include="Documents\htmlhelp\drex_analysis_screen_screen.png" />
     <Content Include="Documents\htmlhelp\drex_assessments_menu_control_1.png" />
     <Content Include="Documents\htmlhelp\drex_assessments_menu_control_2.png" />
@@ -3461,6 +3463,15 @@
     <Content Include="Documents\htmlhelp\drex_cfats_tiers_custom.png" />
     <Content Include="Documents\htmlhelp\drex_cfats_tiers_custom_2.png" />
     <Content Include="Documents\htmlhelp\drex_change_password_custom.png" />
+    <Content Include="Documents\htmlhelp\drex_cmmc_custom.png" />
+    <Content Include="Documents\htmlhelp\drex_cmmc_custom_2.png" />
+    <Content Include="Documents\htmlhelp\drex_cmmc_custom_3.png" />
+    <Content Include="Documents\htmlhelp\drex_cmmc_custom_4.png" />
+    <Content Include="Documents\htmlhelp\drex_cmmc_custom_5.png" />
+    <Content Include="Documents\htmlhelp\drex_cmmc_custom_6.png" />
+    <Content Include="Documents\htmlhelp\drex_cmmc_custom_7.png" />
+    <Content Include="Documents\htmlhelp\drex_cmmc_custom_8.png" />
+    <Content Include="Documents\htmlhelp\drex_cmmc_custom_9.png" />
     <Content Include="Documents\htmlhelp\drex_comments_section_custom.png" />
     <Content Include="Documents\htmlhelp\drex_comments_section_custom_2.png" />
     <Content Include="Documents\htmlhelp\drex_compare_custom.png" />
@@ -3634,6 +3645,7 @@
     <Content Include="Documents\htmlhelp\drex_maturity_model_selection_control_2.png" />
     <Content Include="Documents\htmlhelp\drex_maturity_model_selection_control_3.png" />
     <Content Include="Documents\htmlhelp\drex_maturity_model_selection_control_4.png" />
+    <Content Include="Documents\htmlhelp\drex_maturity_model_selection_custom.png" />
     <Content Include="Documents\htmlhelp\drex_maturity_model_selection_screen.png" />
     <Content Include="Documents\htmlhelp\drex_merge_custom.png" />
     <Content Include="Documents\htmlhelp\drex_merge_custom_2.png" />
@@ -3655,6 +3667,8 @@
     <Content Include="Documents\htmlhelp\drex_preparation_menu_control_1.png" />
     <Content Include="Documents\htmlhelp\drex_preparation_menu_control_2.png" />
     <Content Include="Documents\htmlhelp\drex_preparation_menu_control_3.png" />
+    <Content Include="Documents\htmlhelp\drex_preparation_menu_custom.png" />
+    <Content Include="Documents\htmlhelp\drex_preparation_menu_custom_2.png" />
     <Content Include="Documents\htmlhelp\drex_preparation_menu_screen.png" />
     <Content Include="Documents\htmlhelp\drex_prepare_assessment_info_custom.png" />
     <Content Include="Documents\htmlhelp\drex_prepare_demographics_selection_custom.png" />
@@ -3706,6 +3720,8 @@
     <Content Include="Documents\htmlhelp\drex_question_details__resources__and_comments_custom_4.png" />
     <Content Include="Documents\htmlhelp\drex_question_details__resources__and_comments_custom_5.png" />
     <Content Include="Documents\htmlhelp\drex_question_details__resources__and_comments_custom_6.png" />
+    <Content Include="Documents\htmlhelp\drex_question_details__resources__and_comments_custom_7.png" />
+    <Content Include="Documents\htmlhelp\drex_question_details__resources__and_comments_custom_8.png" />
     <Content Include="Documents\htmlhelp\drex_question_details__resources__and_comments_screen.png" />
     <Content Include="Documents\htmlhelp\drex_question_filter_custom.png" />
     <Content Include="Documents\htmlhelp\drex_question_filter_custom_2.png" />
@@ -3726,6 +3742,8 @@
     <Content Include="Documents\htmlhelp\drex_results_menu_control_1.png" />
     <Content Include="Documents\htmlhelp\drex_results_menu_control_2.png" />
     <Content Include="Documents\htmlhelp\drex_results_menu_control_3.png" />
+    <Content Include="Documents\htmlhelp\drex_results_menu_custom.png" />
+    <Content Include="Documents\htmlhelp\drex_results_menu_custom_2.png" />
     <Content Include="Documents\htmlhelp\drex_results_menu_screen.png" />
     <Content Include="Documents\htmlhelp\drex_results_ranked_questions_screen_control_1.png" />
     <Content Include="Documents\htmlhelp\drex_results_ranked_questions_screen_screen.png" />

CSETWebApi/CSETWeb_Api/CSETWeb_Api/Documents/htmlhelp/assessment_categories.htm

@@ -334,14 +334,14 @@
 <div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;">&#160;</div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;">
 <a class="anchor" id="wndid_top"></a>
-<map name="controlmapd4f827bb_a94b_42d2_8513_750d19c56cea" id="controlmapd4f827bb_a94b_42d2_8513_750d19c56cea">
+<map name="controlmapdaf1636a_c925_4696_97db_494c5bb043ce" id="controlmapdaf1636a_c925_4696_97db_494c5bb043ce">
 <area shape="rect" alt="" href="#id_1" coords="139,164,355,190" data-coord-left="139" data-coord-top="164" data-coord-right="355" data-coord-bottom="190"  />
 <area shape="rect" alt="" href="#id_1" coords="99,163,118,182" data-coord-left="99" data-coord-top="163" data-coord-right="118" data-coord-bottom="182"  />
 <area shape="rect" alt="" href="#id_2" coords="134,206,430,231" data-coord-left="134" data-coord-top="206" data-coord-right="430" data-coord-bottom="231"  />
 <area shape="rect" alt="" href="#id_2" coords="100,208,119,227" data-coord-left="100" data-coord-top="208" data-coord-right="119" data-coord-bottom="227"  />
 <area shape="rect" alt="" href="#id_3" coords="174,466,686,530" data-coord-left="174" data-coord-top="466" data-coord-right="686" data-coord-bottom="530"  />
 <area shape="rect" alt="" href="#id_3" coords="98,478,117,497" data-coord-left="98" data-coord-top="478" data-coord-right="117" data-coord-bottom="497"  />
-</map><img usemap="#controlmapd4f827bb_a94b_42d2_8513_750d19c56cea"  alt="Assessment Categories" style="border: solid 0px;  " width="911" height="608" class="de_wndimg de_780D01ADE8" src="drex_assessment_categories_screen.png"/></div>
+</map><img usemap="#controlmapdaf1636a_c925_4696_97db_494c5bb043ce"  alt="Assessment Categories" style="border: solid 0px;  " width="911" height="608" class="de_wndimg de_780D01ADE8" src="drex_assessment_categories_screen.png"/></div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;"><span class="Caption"><strong>Figure: Question Categories</strong></span></div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;">&#160;</div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;">&#160;</div>

CSETWebApi/CSETWeb_Api/CSETWeb_Api/Documents/htmlhelp/assessments_menu.htm

@@ -331,14 +331,14 @@
 <div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;">&#160;</div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;">
 <a class="anchor" id="wndid_top"></a>
-<map name="controlmap7412c122_b4f8_4b8d_8347_a64a20fad971" id="controlmap7412c122_b4f8_4b8d_8347_a64a20fad971">
+<map name="controlmap4871101e_51dc_4d48_ba1e_cb2270360cd1" id="controlmap4871101e_51dc_4d48_ba1e_cb2270360cd1">
 <area shape="rect" alt="" href="#id_1" coords="375,86,472,114" data-coord-left="375" data-coord-top="86" data-coord-right="472" data-coord-bottom="114"  />
 <area shape="rect" alt="" href="#id_1" coords="427,24,448,45" data-coord-left="427" data-coord-top="24" data-coord-right="448" data-coord-bottom="45"  />
 <area shape="rect" alt="" href="#id_3" coords="131,134,272,188" data-coord-left="131" data-coord-top="134" data-coord-right="272" data-coord-bottom="188"  />
 <area shape="rect" alt="" href="#id_3" coords="93,151,113,172" data-coord-left="93" data-coord-top="151" data-coord-right="113" data-coord-bottom="172"  />
 <area shape="rect" alt="" href="#id_2" coords="135,88,157,109" data-coord-left="135" data-coord-top="88" data-coord-right="157" data-coord-bottom="109"  />
 <area shape="rect" alt="" href="#id_2" coords="99,94,120,115" data-coord-left="99" data-coord-top="94" data-coord-right="120" data-coord-bottom="115"  />
-</map><img usemap="#controlmap7412c122_b4f8_4b8d_8347_a64a20fad971"  alt="Assessments Menu" style="border: solid 0px;  " width="825" height="599" class="de_wndimg de_780D01ADE8" src="drex_assessments_menu_screen.png"/></div>
+</map><img usemap="#controlmap4871101e_51dc_4d48_ba1e_cb2270360cd1"  alt="Assessments Menu" style="border: solid 0px;  " width="825" height="599" class="de_wndimg de_780D01ADE8" src="drex_assessments_menu_screen.png"/></div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;"><span class="Caption"><strong>Figure: Assessment button/menu</strong></span></div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;">&#160;</div>
 <div class="p" style="text-align: center; direction: ltr; margin-left: 0px; text-indent: 0px;"><div class="de_ctrl"><table><tr><td><a class="anchor" id="id_1"></a><div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;"><a class="anchor" href="#wndid_top"><img  alt="1" style="border: solid 0px;  float: left; " width="40" height="40" class="de_ctrlbullet de_780D01ADE8" src="drex_bullet_1.png"/></a><div class="ic"><h2><strong>Assessments tab</strong></h2></div></div>

CSETWebApi/CSETWeb_Api/CSETWeb_Api/Documents/htmlhelp/cmmc.htm

@@ -358,7 +358,7 @@
 <div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;"><div class="list-marker" style="color:#003366;font-size:12pt;font-family:&quot;Arial&quot;; display: inline-block; direction: ltr;"></div><span class="Subtitle"><strong>CMMC Pie Chart:</strong></span><strong> </strong>Displays compliant vs. non-compliant percentages for each level assessed.</div>
 </li></ul><div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;">&#160;</div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;">&#160;</div>
-<div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;"><img  alt="" style="border: solid 0px;  " width="1200" height="697" class=" de_780D01ADE8" src="drex_cmmc_custom_4.png"/></div>
+<div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;"><img  alt="" style="border: solid 0px;  " width="1077" height="625" class=" de_780D01ADE8" src="drex_cmmc_custom_4.png"/></div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;">&#160;</div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;">&#160;</div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;">&#160;</div>
@@ -375,14 +375,14 @@
 </li><li class="list-element list-counter-32" style="color:#003366;font-size:12pt;font-family:&quot;Arial&quot;; direction: ltr; counter-reset: list-counter-32;">
 <div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;"><div class="list-marker" style="color:#003366;font-size:12pt;font-family:&quot;Arial&quot;; display: inline-block; direction: ltr;"></div><span class="Subtitle"><strong>Gaps Graph:</strong></span> This section shows the gap analysis for each domain<strong>.</strong></div>
 </li></ul><div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;">&#160;</div>
-<div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;"><img  alt="" style="border: solid 0px;  " width="1200" height="561" class=" de_780D01ADE8" src="drex_cmmc_custom_6.png"/></div>
+<div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;"><img  alt="" style="border: solid 0px;  " width="1067" height="499" class=" de_780D01ADE8" src="drex_cmmc_custom_6.png"/></div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;">&#160;</div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;">&#160;</div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;">&#160;</div>
 <ul class="de_list"><li class="list-element list-counter-33" style="color:#003366;font-size:12pt;font-family:&quot;Arial&quot;; direction: ltr; counter-reset: list-counter-33;">
 <div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;"><div class="list-marker" style="color:#003366;font-size:12pt;font-family:&quot;Arial&quot;; display: inline-block; direction: ltr;"></div><span class="Subtitle"><strong>Gaps List Scorecard:</strong></span><strong> </strong>This section shows each CMMC domain with the individual practices detailed in list format after each domain-specific sub heading.<span class="Subtitle"><strong> </strong></span>The compliance score for each individual practice is shown on the right, along with the associated cumulative score for each practice and the percent complete for each CMMC domain. </div>
 </li></ul><div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;">&#160;</div>
-<div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;"><img  alt="" style="border: solid 0px;  " width="1200" height="705" class=" de_780D01ADE8" src="drex_cmmc_custom_7.png"/></div>
+<div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;"><img  alt="" style="border: solid 0px;  " width="1100" height="646" class=" de_780D01ADE8" src="drex_cmmc_custom_7.png"/></div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;">&#160;</div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;">&#160;</div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 50px; text-indent: 0px;">&#160;</div>

CSETWebApi/CSETWeb_Api/CSETWeb_Api/Documents/htmlhelp/component_information.htm

@@ -332,13 +332,13 @@
 <div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;">&#160;</div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;"><span class="de_4AF4BF9DD6">When components have been added to the network diagram the system will create a set of component default questions. If no additional action is taken, the answers to the default questions will apply to all the components in the diagram. If actions are taken, such as marking a component as unique or overriding the default, then new questions will be presented for each identified component or type. Several rules apply to the way questions are managed.</span></div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;">&#160;</div>
-<ul class="de_list"><li class="list-element list-counter-62" style="color:#000000;font-size:11pt;font-family:&quot;Arial&quot;; direction: ltr; counter-reset: list-counter-62;">
+<ul class="de_list"><li class="list-element list-counter-63" style="color:#000000;font-size:11pt;font-family:&quot;Arial&quot;; direction: ltr; counter-reset: list-counter-63;">
 <div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;"><div class="list-marker" style="color:#000000;font-size:11pt;font-family:&quot;Arial&quot;; display: inline-block; direction: ltr;"></div><span class="de_4AF4BF9DD6">A question will be included in the list if it maps to the component placed on the diagram. For example, a clock component may have only one question and one category listed while an application server may have ten categories and over forty questions. A variety of component types will cause all the categories to be displayed along with a large number of questions. This means that only those questions that pertain to selected components will be displayed. Questions that do not pertain to any components on the diagram will not be displayed or counted.</span></div>
 </li></ul><div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;">&#160;</div>
-<ul class="de_list"><li class="list-element list-counter-63" style="color:#000000;font-size:11pt;font-family:&quot;Arial&quot;; direction: ltr; counter-reset: list-counter-63;">
+<ul class="de_list"><li class="list-element list-counter-64" style="color:#000000;font-size:11pt;font-family:&quot;Arial&quot;; direction: ltr; counter-reset: list-counter-64;">
 <div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;"><div class="list-marker" style="color:#000000;font-size:11pt;font-family:&quot;Arial&quot;; display: inline-block; direction: ltr;"></div>You may mark any single component as unique in the diagram by clicking the checkbox labeled Has Unique Questions in the Properties popup window for the selected component. When you click this checkbox and mark it as true, CSET will add a complete set of questions related to that component type. This means that questions that were presented as component defaults will be asked again specifically for that component. </div>
 </li></ul><div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;">&#160;</div>
-<ul class="de_list"><li class="list-element list-counter-64" style="color:#000000;font-size:11pt;font-family:&quot;Arial&quot;; direction: ltr; counter-reset: list-counter-64;">
+<ul class="de_list"><li class="list-element list-counter-65" style="color:#000000;font-size:11pt;font-family:&quot;Arial&quot;; direction: ltr; counter-reset: list-counter-65;">
 <div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;"><div class="list-marker" style="color:#000000;font-size:11pt;font-family:&quot;Arial&quot;; display: inline-block; direction: ltr;"></div><span class="de_4AF4BF9DD6">You may override a default answer for either a component type or for a single component. The image below shows the Question Information panel for component defaults. In addition to the normal reference information, it includes a new list titled Component Types. There i</span>s an option of Override or None<span class="de_4AF4BF9DD6"> next to each type. This list will vary for every question and will depend on whether the question applies to that component type. To override the default answer for a specific type, simply click on the Override link next to that type.</span></div>
 </li></ul><div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;">&#160;</div>
 <div class="p" style="text-align: left; direction: ltr; margin-left: 0px; text-indent: 0px;"><img  alt="" style="border: solid 0px;  " width="650" height="455" class=" de_780D01ADE8" src="drex_component_information_custom.png"/></div>