diff --git a/amp/.gitignore b/amp/.gitignore index 589d9520628..10f20181949 100644 --- a/amp/.gitignore +++ b/amp/.gitignore @@ -10,3 +10,4 @@ lucene/ rebel.xml /api-docs/ /derby.log +**/.DS_Store \ No newline at end of file diff --git a/amp/Dockerfile b/amp/Dockerfile index f68bb4747e3..35893d8151d 100644 --- a/amp/Dockerfile +++ b/amp/Dockerfile @@ -1,39 +1,128 @@ -FROM maven:3.8.4-jdk-8 as base +FROM node:16.4.0 as node + +FROM node as compile-amp-state +WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-state +COPY TEMPLATE/ampTemplate/node_modules/amp-state . +RUN --mount=type=cache,target=/root/.npm \ + npm ci + +FROM node as compile-amp-translate +WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate +COPY TEMPLATE/ampTemplate/node_modules/amp-translate . +RUN --mount=type=cache,target=/root/.npm \ + npm ci + +FROM node as compile-amp-boilerplate +WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate +COPY TEMPLATE/ampTemplate/node_modules/amp-boilerplate . +COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../amp-translate +RUN --mount=type=cache,target=/root/.npm \ + npm ci \ + && npm run build + +FROM node as compile-amp-filter +WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-filter +COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../amp-translate +COPY TEMPLATE/ampTemplate/node_modules/amp-filter . +# HACK otherwise amp-filter won't compile! +COPY TEMPLATE/reamp/tools/log /tmp/amp/TEMPLATE/reamp/tools/log +RUN --mount=type=cache,target=/root/.npm \ + npm ci \ + && npm run build + +FROM node as compile-amp-settings +WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-settings +COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../amp-translate +COPY TEMPLATE/ampTemplate/node_modules/amp-settings . +RUN --mount=type=cache,target=/root/.npm \ + npm ci \ + && npm run build + +FROM node as compile-gis-layers-manager +WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager +COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../amp-translate +COPY TEMPLATE/ampTemplate/node_modules/gis-layers-manager . +RUN --mount=type=cache,target=/root/.npm \ + npm ci \ + && npm run build + +FROM node as compile-gis-module +WORKDIR /tmp/amp/TEMPLATE/ampTemplate/gisModule +COPY --from=compile-amp-state /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-state ../node_modules/amp-state +COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../node_modules/amp-translate +COPY --from=compile-amp-boilerplate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate ../node_modules/amp-boilerplate +COPY --from=compile-amp-filter /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-filter ../node_modules/amp-filter +# HACK otherwise amp-filter won't compile! +COPY TEMPLATE/reamp/tools/log /tmp/amp/TEMPLATE/reamp/tools/log +COPY --from=compile-amp-settings /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-settings ../node_modules/amp-settings +COPY --from=compile-gis-layers-manager /tmp/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager ../node_modules/gis-layers-manager +COPY TEMPLATE/ampTemplate/gisModule . +RUN --mount=type=cache,target=/root/.npm \ + cd dev \ + && npm ci \ + && npm run test \ + && npm run build \ + && rm -rf node_modules + +FROM node as compile-dashboard +WORKDIR /tmp/amp/TEMPLATE/ampTemplate/dashboard +COPY --from=compile-amp-state /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-state ../node_modules/amp-state +COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../node_modules/amp-translate +COPY --from=compile-amp-boilerplate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate ../node_modules/amp-boilerplate +COPY --from=compile-amp-filter /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-filter ../node_modules/amp-filter +# HACK otherwise amp-filter won't compile! +COPY TEMPLATE/reamp/tools/log /tmp/amp/TEMPLATE/reamp/tools/log +COPY --from=compile-amp-settings /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-settings ../node_modules/amp-settings +COPY TEMPLATE/ampTemplate/node_modules/amp-url ../node_modules/amp-url +COPY TEMPLATE/ampTemplate/dashboard . +RUN --mount=type=cache,target=/root/.npm \ + cd dev \ + && npm ci \ + && npm run build \ + && rm -rf node_modules + +FROM node as compile-reamp +WORKDIR /tmp/amp/TEMPLATE/reamp +COPY --from=compile-amp-boilerplate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate ../ampTemplate/node_modules/amp-boilerplate +COPY TEMPLATE/reamp . +RUN --mount=type=cache,target=/root/.npm \ + --mount=type=ssh \ + npm ci \ + && npm run build \ + && rm -rf node_modules + +FROM node as compile-reampv2 +WORKDIR /tmp/amp/TEMPLATE/reampv2 +COPY --from=compile-amp-boilerplate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate ../ampTemplate/node_modules/amp-boilerplate +COPY --from=compile-amp-filter /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-filter ../ampTemplate/node_modules/amp-filter +COPY --from=compile-amp-settings /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-settings ../ampTemplate/node_modules/amp-settings +COPY TEMPLATE/reampv2 . +RUN --mount=type=cache,target=/root/.npm \ + --mount=type=ssh \ + npm ci \ + && npm run build \ + && rm -rf node_modules + +FROM maven:3.8.4-jdk-8 as compile-mvn WORKDIR /tmp/amp COPY . . - -FROM base as compile +COPY --from=compile-amp-boilerplate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/dist TEMPLATE/ampTemplate/node_modules/amp-boilerplate/dist +COPY --from=compile-amp-filter /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/dist TEMPLATE/ampTemplate/node_modules/amp-filter/dist +COPY --from=compile-amp-settings /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/dist TEMPLATE/ampTemplate/node_modules/amp-settings/dist +COPY --from=compile-gis-layers-manager /tmp/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager/dist TEMPLATE/ampTemplate/node_modules/gis-layers-manager/dist +COPY --from=compile-gis-module /tmp/amp/TEMPLATE/ampTemplate/gisModule/dist TEMPLATE/ampTemplate/gisModule/dist +COPY --from=compile-dashboard /tmp/amp/TEMPLATE/ampTemplate/dashboard/build TEMPLATE/ampTemplate/dashboard/build +COPY --from=compile-reamp /tmp/amp/TEMPLATE/reamp TEMPLATE/reamp +COPY --from=compile-reampv2 /tmp/amp/TEMPLATE/reampv2/build TEMPLATE/reampv2/build ARG BUILD_SOURCE -RUN mkdir -p -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts -RUN --mount=type=ssh \ - --mount=type=cache,target=/root/.m2 \ - --mount=type=cache,target=/root/.npm \ +RUN --mount=type=cache,target=/root/.m2 \ mvn -B test war:exploded \ -DbuildSource=$BUILD_SOURCE \ -Djdbc.user=amp -Djdbc.password=amp122006 -Djdbc.db=amp -Djdbc.host=db \ -Djdbc.port=5432 -DdbName=postgresql -Djdbc.driverClassName=org.postgresql.Driver \ + -Dskip.npm -Dskip.installnodenpm \ && mv target/amp exploded \ - && rm -rf target \ - TEMPLATE/ampTemplate/node_modules/amp-boilerplate/node \ - TEMPLATE/ampTemplate/node_modules/amp-boilerplate/node_modules \ - TEMPLATE/ampTemplate/node_modules/gis-layers-manager/node \ - TEMPLATE/ampTemplate/node_modules/gis-layers-manager/node_modules \ - TEMPLATE/ampTemplate/node_modules/amp-settings/node \ - TEMPLATE/ampTemplate/node_modules/amp-settings/node_modules \ - TEMPLATE/ampTemplate/node_modules/amp-translate/node \ - TEMPLATE/ampTemplate/node_modules/amp-translate/node_modules \ - TEMPLATE/ampTemplate/node_modules/amp-state/node \ - TEMPLATE/ampTemplate/node_modules/amp-state/node_modules \ - TEMPLATE/ampTemplate/node_modules/amp-filter/node \ - TEMPLATE/ampTemplate/node_modules/amp-filter/node_modules \ - TEMPLATE/ampTemplate/gisModule/dev/node \ - TEMPLATE/ampTemplate/gisModule/dev/node_modules \ - TEMPLATE/ampTemplate/dashboard/dev/node \ - TEMPLATE/ampTemplate/dashboard/dev/node_modules \ - TEMPLATE/reamp/node \ - TEMPLATE/reamp/node_modules \ - TEMPLATE/reampv2/node \ - TEMPLATE/reampv2/node_modules + && rm -rf target FROM tomcat:8.5.79-jdk8 @@ -62,4 +151,4 @@ LABEL "branch"=$AMP_BRANCH ENV AMP_REGISTRY_PRIVATE_KEY $AMP_REGISTRY_PRIVATE_KEY RUN rm -fr /usr/local/tomcat/webapps/ROOT -COPY --from=compile /tmp/amp/exploded /usr/local/tomcat/webapps/ROOT/ +COPY --from=compile-mvn /tmp/amp/exploded /usr/local/tomcat/webapps/ROOT/ diff --git a/amp/TEMPLATE/ampTemplate/css_2/amp.css b/amp/TEMPLATE/ampTemplate/css_2/amp.css index 2a41230ab89..312b192ecd1 100644 --- a/amp/TEMPLATE/ampTemplate/css_2/amp.css +++ b/amp/TEMPLATE/ampTemplate/css_2/amp.css @@ -41,7 +41,7 @@ table.fixed-layout {table-layout:fixed; width: 100%;} td select.inp-text-orgType{width:250px;} td input#keyWordTextField{height:22px;} table#addUserContainer tr td input {border:1px solid #D0D0D0; background-color:#FFFFFF;margin:0px 0px 0px 5px; width:150px;} -table tr td.f-names{font-weight:bold;} +table tr td.f-names{font-weight:700; font-size: 14px;} .insidex{font-size:11px;color:#000000;padding:2px;margin:5px} .dropdwn_sm {border:1px solid #D0D0D0; font-size:11px; background-color:#FFFFFF;} .dropdwn_sm_wksp {border:1px solid #CCCCCC; font-size:11px; background-color:#FFFFFF; color:#000000;} @@ -64,7 +64,7 @@ li.bullet {margin-left:14px;} #exportDiv td.inside { - vertical-align: top; + vertical-align: top; } td.inside a img {border:0;} @@ -338,9 +338,9 @@ html.chrome #show_login_pop_box{margin-top:44px;} font-size: 11px; margin-top: 25px; padding-bottom: 10px; - width:100%; + width:100%; padding-top: 10px; - text-align:center; + text-align:center; } .dialog {display:none;} @@ -406,14 +406,16 @@ ul.first-of-type li.yui-gen14 {} /*-----rafy-----*/ div.reg_form_container{width:1000px; margin:0 auto;text-align:center;} div.reg_form_container table {margin:0 auto; } -div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #d0d0d0;height:18px;} -div.reg_form_container .buttonx {background-color:#5E8AD1; border-top: 1px solid #99BAF1; border-left:1px solid #99BAF1; border-right:1px solid #225099; border-bottom:1px solid #225099; font-size:11px; color:#FFFFFF; font-weight:bold; padding-left:5px; padding-right:5px; padding-top:3px; padding-bottom:3px; height:25px;} +/* timothymugo - add height of the input boxes */ +div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #d0d0d0;height:30px;} +div.reg_form_container .buttonx {background-color:#68b35b; font-size:14px; color:#FFFFFF; font-weight:bold; padding: 3px 5px; height:30px; width: 200px; margin-right: 421px; } div.reg_form_container form input.dr-menu, div.reg_form_container input.dr-menu{ font-size:14px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin:10px;height:25px;border:1px solid #364d5a;} div.reg_form_title{text-align:left;border-top:5px solid #4A687A; margin:0px 0px 20px 0px; background:#f0f0f0;padding:0px 0px 10px 0px;border-bottom:1px solid #ccccce;} div.reg_form_container h2 { font-size:30px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin-left:10px; padding:5px; letter-spacing:-1px; margin-right:10px;display:inline;} span.formnote{color:#595959; font-size:14px;font-weight:bold;line-height:20px;} +span.formnote .login_warning_title{font-size: 16px; font-weight: 600; color: #225099FF;} td.title{background-color:#f0f0f0;color:#999; font-size:12px;font-weight:bold;padding:10px;} -div.reg_form_container .f-names {color:#000000; font-size:12px;} +div.reg_form_container .f-names {color: rgba(0, 0, 0, 0.6); font-size:12px;} div.breadcrumbsplaceholder {height:25px; clear:both;margin:20px 0px 20px 0px; width:950px; background:#f0f0f0; color:#000;} #amphome{width:1000px; margin:0 auto;} #amphomesidebar{width:220px; float:right;} @@ -423,10 +425,10 @@ div.breadcrumbsplaceholder {height:25px; clear:both;margin:20px 0px 20px 0px; wi font-size: 11px; margin: 5px; padding: 2px; - background-color: #FFFFFF; + background-color: #FFFFFF; border: 1px solid #D0D0D0;} #Tab_Name td#reportsearchform1 input, #Tab_Name td#reportsearchform2 input - { background-color: #5E8AD1; +{ background-color: #5E8AD1; border-color: #99BAF1 #225099 #225099 #99BAF1; border-style: solid; border-width: 1px; @@ -457,14 +459,14 @@ table#addUserContainer td.addUserButContainer input, td.addUserButContainer inpu font-weight: bold; height: 25px; padding: 3px 5px;} - .ampFormContainer - {width:1000px; - margin:0 auto; - text-align:left;} - .formCheckContainer{text-align:right;font-weight:bold;} +.ampFormContainer +{width:1000px; + margin:0 auto; + text-align:left;} +.formCheckContainer{text-align:right;font-weight:bold;} .formCheckContainer input - {float:right;} - #auditloggertable{border:1px solid #cccccc;border-left:none;} +{float:right;} +#auditloggertable{border:1px solid #cccccc;border-left:none;} #auditloggertable tr td{border-bottom:1px solid #cccccc;border-left:1px solid #cccccc;padding:10px;} #auditloggertable tr td.auditloggername{color:#376091;font-weight:bold;font-size:12px;} #auditloggermanagercontainer{background:#f2f2f2; border:1px solid #cccccc;padding:10px;width:980px;margin:0 auto;} @@ -507,39 +509,44 @@ div.adminicon{float:right;} #breadcrumbs {width:1000px;padding:0px;height:30px;margin:0px 0px 0px 0px;margin:0 auto;position:relative;text-align:left;} #breadcrumbs ul{float:left;} #breadcrumbs ul li { - display:inline; - padding:0px; - margin:0px; - line-height:30px; + display:inline; + padding:0px; + margin:0px; + line-height:30px; } #breadcrumbs, #breadcrumbs li.yuimenuitem a { - color: #376091; - font-size: 10px; - font-family:arial; - padding:3px 10px 3px 0px; - margin:0px; - padding-top:0px; - font-weight:bold; - text-decoration:none; - text-align: left; - background:url(/TEMPLATE/ampTemplate/img_2/breadcrumbsep.gif) no-repeat right; + color: #376091; + font-size: 10px; + font-family:arial; + padding:3px 10px 3px 0px; + margin:0px; + padding-top:0px; + font-weight:bold; + text-decoration:none; + text-align: left; + background:url(/TEMPLATE/ampTemplate/img_2/breadcrumbsep.gif) no-repeat right; } #breadcrumbs .bd li.yuimenuitem a:hover { - text-decoration:underline; + text-decoration:underline; } /*-----rafy-----*/ -div.reg_form_container{width:1000px; margin:0 auto;text-align:center;} +div.reg_form_container{width:auto; text-align: left; margin-left: -50px;} div.reg_form_container table {margin:0 auto; } -div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #d0d0d0;height:18px; width:145px;} -div.reg_form_container .buttonx {background-color:#5E8AD1; border-top: 1px solid #99BAF1; border-left:1px solid #99BAF1; border-right:1px solid #225099; border-bottom:1px solid #225099; font-size:11px; color:#FFFFFF; font-weight:bold; padding-left:5px; padding-right:5px; padding-top:3px; padding-bottom:3px; height:25px;} +/* Modify the input boxes - timothymugo */ +div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #e6e9ed;height:32px; font-size: 12px; font-weight: 500; width: 280px; padding: 5px 20px; border-radius: 5px;} +div.reg_form_container .buttonx {background-color:#68b35b; border-top: 1px solid #99BAF1; font-size:14px; color:#FFFFFF; font-weight: 700; padding: 3px 5px; height:30px;} div.reg_form_container form input.dr-menu, div.reg_form_container input.dr-menu{ font-size:14px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin:10px;height:25px;border:1px solid #364d5a;} div.reg_form_title{text-align:left;border-top:5px solid #4A687A; margin:0px 0px 20px 0px; background:#f0f0f0;padding:0px 0px 10px 0px;border-bottom:1px solid #ccccce;} div.reg_form_container h2 { font-size:30px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin-left:10px; padding:5px; letter-spacing:-1px; margin-right:10px;display:inline;} -span.formnote{color:#595959; font-size:14px;font-weight:bold;line-height:20px;} +span.formnote{color:#595959; font-size:14px;font-weight:500;line-height:20px;} td.title{background-color:#f0f0f0;color:#999; font-size:12px;font-weight:bold;padding:10px;} -div.reg_form_container .f-names {color:#000000; font-size:12px;} +/* changed font-size */ +div.reg_form_container .f-names {color: #3e6280; font-size:14px; text-align: right; padding-right: 10px;} +/* added input row container - tmugo */ +div.reg_form_container .input_row_container td { border-bottom: 1px solid #edeff1; padding: 8px;} +div.reg_form_container .reg_submit_btn_container td { padding: 20px 18px; border-bottom: none;} div.breadcrumbsplaceholder {height:25px; clear:both;margin:20px 0px 20px 0px; width:950px; background:#f0f0f0; color:#000;} #amphome{width:1000px; margin:0 auto;} #amphometext{width:740px; float:left;} @@ -553,10 +560,10 @@ html.ie #amphomesidebar{width:200px;} font-size: 11px; margin: 5px; padding: 2px; - background-color: #FFFFFF; + background-color: #FFFFFF; border: 1px solid #D0D0D0;} #Tab_Name td#reportsearchform1 input, #Tab_Name td#reportsearchform2 input - { background-color: #5E8AD1; +{ background-color: #5E8AD1; border-color: #99BAF1 #225099 #225099 #99BAF1; border-style: solid; border-width: 1px; @@ -587,14 +594,14 @@ table#addUserContainer td.addUserButContainer input, td.addUserButContainer inpu font-weight: bold; height: 25px; padding: 3px 5px;} - .ampFormContainer - {width:1000px; - margin:0 auto; - text-align:left;} - .formCheckContainer{text-align:right;font-weight:bold;} +.ampFormContainer +{width:1000px; + margin:0 auto; + text-align:left;} +.formCheckContainer{text-align:right;font-weight:bold;} .formCheckContainer input - {float:right;} - #auditloggertable{border:1px solid #cccccc;border-left:none;} +{float:right;} +#auditloggertable{border:1px solid #cccccc;border-left:none;} #auditloggertable tr td{border-bottom:1px solid #cccccc;border-left:1px solid #cccccc;padding:10px;} #auditloggertable tr td.auditloggername{color:#376091;font-weight:bold;font-size:12px;} #auditloggermanagercontainer{background:#f2f2f2; border:1px solid #cccccc;padding:10px;width:980px;margin:0 auto;} @@ -637,25 +644,25 @@ div.adminicon{float:right;} #breadcrumbs {width:1000px;padding:0px;height:30px;margin:0px 0px 0px 0px;margin:0 auto;position:relative;text-align:left;} #breadcrumbs ul{float:left;} #breadcrumbs ul li { - display:inline; - padding:0px; - margin:0px; - line-height:30px; + display:inline; + padding:0px; + margin:0px; + line-height:30px; } #breadcrumbs, #breadcrumbs li.yuimenuitem a { - color: #376091; - font-size: 10px; - font-family:arial; - padding:3px 10px 3px 0px; - margin:0px; - padding-top:0px; - font-weight:bold; - text-decoration:none; - text-align: left; - background:url(/TEMPLATE/ampTemplate/img_2/breadcrumbsep.gif) no-repeat right; + color: #376091; + font-size: 10px; + font-family:arial; + padding:3px 10px 3px 0px; + margin:0px; + padding-top:0px; + font-weight:bold; + text-decoration:none; + text-align: left; + background:url(/TEMPLATE/ampTemplate/img_2/breadcrumbsep.gif) no-repeat right; } #breadcrumbs .bd li.yuimenuitem a:hover { - text-decoration:underline; + text-decoration:underline; } .usr_menu_logged{position:absolute;top:0px;right:0px;} @@ -702,8 +709,8 @@ div.adminicon{float:right;} .admin_landing_page_tbl {margin-top:10px;} .yui-panel { border-collapse: separate; - font-family:arial; - table-layout:fixed; + font-family:arial; + table-layout:fixed; } /**-----IE FIXES-----**/ /* @@ -714,11 +721,11 @@ html.ie .main_menu{height:25px;margin:0 auto;text-align:left;border:none;positio html.chrome .login_nav{padding:0px;margin:0px;} html.chrome .login_here { - background-color: #65B457; - width: 125px; - height: 33px; - text-align: center; - margin-top:10px; + background-color: #65B457; + width: 125px; + height: 33px; + text-align: center; + margin-top:10px; } html.chrome .login_here:hover { background-color: #B4EEAA; @@ -728,13 +735,13 @@ html.chrome .login_here:hover { html.ie li.yuiampmenuitem a {padding-top: 0px !important;} html.ie #show_login_pop_box{ border:1px solid #cccccc;position:absolute;left:0px; top:15px;z-index:9999;} html.ie .login_here { - background-color: #65B457; - width: 125px; - height: 33px; - text-align: center; - position: absolute; - top: 15px; - left: 10px; + background-color: #65B457; + width: 125px; + height: 33px; + text-align: center; + position: absolute; + top: 15px; + left: 10px; } html.ie .login_here:hover { background-color: #B4EEAA; @@ -760,7 +767,7 @@ html.ie div.header{z-index:9999;} #previewHeaderSectionDiv {background-color:#F5F5F5; text-align:center; padding-top:5px; padding-bottom:5px; border-top:1px solid #E9E9E9; border-bottom:1px solid #E9E9E9; font-size:11px; font-weight:bold; color:#5C5C5C;} #previewHeaderSectionDiv span {font-size:11px; font-weight:bold; color:#5C5C5C; cursor: pointer;} #components_dots table tr td {font-size:11px;} -table tr td {font-size:11px;} +table tr td {} div.breadcrump_cont{display:none;} .dgf_footer {margin-top:15px; margin-bottom:15px; text-align:center; font-size:11px; color:#8B8B8B; line-height:18px;} @@ -801,15 +808,15 @@ h1.admintitle{font-size:16px;text-transform:none;color: #376091;padding:0px 0px /*---rafy was here---*/ td.wrklist div.workspacelist{background: url(../images/arrow-014E86.gif) no-repeat center left #F2F2F2; -padding: 3px 10px 3px 3px; -margin-bottom: 1px; -font-size: 12px; -text-decoration: none; -height: 20px; -line-height: 20px; -background-position: 5px 7px; -text-indent: 20px; -width:75%; + padding: 3px 10px 3px 3px; + margin-bottom: 1px; + font-size: 12px; + text-decoration: none; + height: 20px; + line-height: 20px; + background-position: 5px 7px; + text-indent: 20px; + width:75%; } td.wrklist div.workspacelist a{text-decoration:none; color:#737373;} td.wrklist div.workspacelist a:hover{text-decoration:underline;color:#376091;} @@ -834,20 +841,20 @@ html.ie div.innertabheader input.inputx{margin-top:5px;vertical-align:top;} html.ie div.menucontainer{margin:0 auto;width:1000px;} */ .subtitle-blue { -BORDER-RIGHT: 1px; -BORDER-TOP: 1px; -FONT-WEIGHT: bold; -FONT-SIZE: 11pt; -PADDING-BOTTOM: 10px; -BORDER-LEFT: 1px; -COLOR: #014e86; -PADDING-TOP: 16px; -BORDER-BOTTOM: 1px; -LETTER-SPACING: 1px; -border-right: 1px; -border-top: 1px; -border-left: 1px; -border-bottom: 1px;} + BORDER-RIGHT: 1px; + BORDER-TOP: 1px; + FONT-WEIGHT: bold; + FONT-SIZE: 11pt; + PADDING-BOTTOM: 10px; + BORDER-LEFT: 1px; + COLOR: #014e86; + PADDING-TOP: 16px; + BORDER-BOTTOM: 1px; + LETTER-SPACING: 1px; + border-right: 1px; + border-top: 1px; + border-left: 1px; + border-bottom: 1px;} legend.admtoolsttl{position:absolute;top:-10px;left:10px;} #customDecimalSymbol{width:64px;} span.geostyle{background:#f1f1f1;padding:3px;border:1px solid #e0e0e0;color:#5d5d5b;font-size:11px;font-weight:normal;} @@ -877,155 +884,155 @@ span.geostyle{background:#f1f1f1;padding:3px;border:1px solid #e0e0e0;color:#5d5 .clear,.innerTab { - clear: both; + clear: both; } div#filterContainer { - width: 740px; - min-height: 350px; - margin: 0 auto; - background: #fff; + width: 740px; + min-height: 350px; + margin: 0 auto; + background: #fff; } div.filterContainerHeader { - background: #e9e9fb; - border-bottom: 1px solid #bfd4e0; - height: 26px; + background: #e9e9fb; + border-bottom: 1px solid #bfd4e0; + height: 26px; } div.filterContainerHeader h2 { - line-height: 26px; - font-size: 12px; - font-weight: bold; - text-indent: 11px; - width: 90%; - float: left; + line-height: 26px; + font-size: 12px; + font-weight: bold; + text-indent: 11px; + width: 90%; + float: left; } div.filterContainerTabs { - width: 740px; - margin: 0 auto; - margin-top: 11px; + width: 740px; + margin: 0 auto; + margin-top: 11px; } div.groupingSelector { - width: 311px; - float: left; - border-bottom: 1px solid #cccccc; - border-right: none; - height: 155px; + width: 311px; + float: left; + border-bottom: 1px solid #cccccc; + border-right: none; + height: 155px; } div.membersSelector { - width: 425px; - float: right; - border-left: 1px solid #cccccc; - border-right: 1px solid #cccccc; - border-bottom: 1px solid #cccccc; - height: 155px; + width: 425px; + float: right; + border-left: 1px solid #cccccc; + border-right: 1px solid #cccccc; + border-bottom: 1px solid #cccccc; + height: 155px; } div.innerTabHeader { - border-bottom: 1px solid #cccccc; - background: url(/TEMPLATE/ampTemplate/img_2/ins_header.gif); - height: 31px; + border-bottom: 1px solid #cccccc; + background: url(/TEMPLATE/ampTemplate/img_2/ins_header.gif); + height: 31px; } div.innerTabHeader h3 { - height: 31px; - line-height: 31px; - text-indent: 11px; - float: left; - font-size: 11px; - color: #767676; - margin: 0; - padding: 0; + height: 31px; + line-height: 31px; + text-indent: 11px; + float: left; + font-size: 11px; + color: #767676; + margin: 0; + padding: 0; } div.membersSelector div.memsearch { - padding: 1px 0px 0px 0px; - width: 230px; - float: right; - text-align: right; + padding: 1px 0px 0px 0px; + width: 230px; + float: right; + text-align: right; } .innerTabHeader input.buttonx { - font-size: 11px; + font-size: 11px; } .groupingSelector ul { - margin: 0 auto; - margin-bottom: 15px; - width: 250px; + margin: 0 auto; + margin-bottom: 15px; + width: 250px; } .groupingSelector ul li { - list-style: none; + list-style: none; } .groupingSelector ul li a { - padding: 5px; - font-size: 12px; - display: block; - background: #fff; - color: #000; - text-decoration: none; + padding: 5px; + font-size: 12px; + display: block; + background: #fff; + color: #000; + text-decoration: none; } .groupingSelector ul li a:hover { - background: #bfd2df; + background: #bfd2df; } div.innerTab { - height: 115px; - overflow: auto; - margin: 2px; - width: 99%; + height: 115px; + overflow: auto; + margin: 2px; + width: 99%; } .otherCriteriaFoofet { - padding: 15px 0px 0px 0px; - clear: both; + padding: 15px 0px 0px 0px; + clear: both; } .otherCriteriaFoofet #calendarForm label { - width: 100px; - font-size: 11px; - display: inline-block; + width: 100px; + font-size: 11px; + display: inline-block; } .otherCriteriaFoofet select { - background-color: #FFFFFF; - border: 1px solid #D0D0D0; - color: #000; - font-size: 11px; - padding: 0px; - width: 150px; + background-color: #FFFFFF; + border: 1px solid #D0D0D0; + color: #000; + font-size: 11px; + padding: 0px; + width: 150px; } .tabSubmit { - text-align: center; - padding: 0px 0px 5px 0px; + text-align: center; + padding: 0px 0px 5px 0px; } .groupingSelectors li a span { - display: inline-block; - float: right; - font-size: 11px; + display: inline-block; + float: right; + font-size: 11px; } .groupingSelector, .groupingSelectors{ - margin: 0; - padding: 0; + margin: 0; + padding: 0; } .advancedTranslations {border:1px solid #DBDBDB; padding:20px;} .controlPanel {margin:0 !important; background-color:#EBEBEB; padding:5px;} @@ -1040,57 +1047,57 @@ div.innerTab { .tab_vis_link { - margin-bottom: 15px; - margin-left: 15px; - font-size: 1.15em; - display: inline-block; - padding: 3px; + margin-bottom: 15px; + margin-left: 15px; + font-size: 1.15em; + display: inline-block; + padding: 3px; } .tab_vis_link:hover { - border: 1px dashed gray; - padding: 2px; /* swallow border's +1 paddings */ - background-color: #FFFFDD; + border: 1px dashed gray; + padding: 2px; /* swallow border's +1 paddings */ + background-color: #FFFFDD; } .dashboards_left_container { - height: 210px; - border: 1px solid #CCCCCC; - overflow: auto; - background: white; - maxHeight: 210px; - padding: 5px; - padding-left: 20px; + height: 210px; + border: 1px solid #CCCCCC; + overflow: auto; + background: white; + maxHeight: 210px; + padding: 5px; + padding-left: 20px; } .dashboards_left_container ul.root_list { - margin-left: 0px; - padding-left: 0px; - list-style-type: none; + margin-left: 0px; + padding-left: 0px; + list-style-type: none; } table.component-funding-table tr { - border-top: 1px solid black; + border-top: 1px solid black; } /* TABLE GLOBAL */ .tableEven { - background-color:#EEF5F9; - font-size:8pt; - padding:2px; + background-color:#EEF5F9; + font-size:8pt; + padding:2px; } .tableOdd { - background-color:#FFFFFF; - font-size:8pt;!important - padding:2px; + background-color:#FFFFFF; + font-size:8pt;!important +padding:2px; } .Hovered { - background-color:#a5bcf2; + background-color:#a5bcf2; } @@ -1104,21 +1111,21 @@ table.component-funding-table tr .yui-skin-sam.smallish .yui-navset .yui-nav .selected a em { - padding: .17em .37em !important; /* smaller padding for tab headers */ + padding: .17em .37em !important; /* smaller padding for tab headers */ } .yui-skin-sam.smallish .yui-navset .yui-nav a em, .yui-skin-sam.smallish .yui-navset .yui-navset-top .yui-nav a em { - padding: .17em .37em !important; /* smaller padding for tab headers */ + padding: .17em .37em !important; /* smaller padding for tab headers */ } .yui-skin-sam.smallish input { - width: 85% !important; - padding: 0.05em !important; - margin: 0.4em 0.12em !important; - border: 1px solid gray !important; - border-radius: 4px !important; + width: 85% !important; + padding: 0.05em !important; + margin: 0.4em 0.12em !important; + border: 1px solid gray !important; + border-radius: 4px !important; } /* @@ -1127,59 +1134,59 @@ table.component-funding-table tr */ .dataTable li{ - list-style-position: inside; + list-style-position: inside; } #actions-table { - background-color: rgb(242, 242, 242); - display: table; - border-collapse: separate; - border-spacing: 2px; - border-color: gray; - margin-bottom: 10px; + background-color: rgb(242, 242, 242); + display: table; + border-collapse: separate; + border-spacing: 2px; + border-color: gray; + margin-bottom: 10px; } .amp-table { - display: table; - border-collapse: separate; - border-spacing: 2px; - border-color: gray; - margin-bottom: 10px; - border-collapse: initial; - border: 1px #cccccc solid; - padding:1px; + display: table; + border-collapse: separate; + border-spacing: 2px; + border-color: gray; + margin-bottom: 10px; + border-collapse: initial; + border: 1px #cccccc solid; + padding:1px; } .workspace-table { - display: table; - border-collapse: separate; - border-color: gray; - margin-bottom: 10px; - border-collapse: initial; + display: table; + border-collapse: separate; + border-color: gray; + margin-bottom: 10px; + border-collapse: initial; } .workspace-table td { - border: 1px #cccccc solid; - padding: 3px + border: 1px #cccccc solid; + padding: 3px } .workspace-table table td { - border: 0px; - padding: 3px + border: 0px; + padding: 3px } #TipLayer table { - border: 1px rgb(128, 128, 128) solid; + border: 1px rgb(128, 128, 128) solid; } #TipLayer table td table:first-of-type { - background-color: rgb(128, 128, 128); + background-color: rgb(128, 128, 128); } #TipLayer table td table:nth-of-type(2) { - background-color: #F2F2F2; + background-color: #F2F2F2; } div.footer { - margin-top:15px; + margin-top:15px; } .img-padding { @@ -1188,37 +1195,37 @@ div.footer { .label-column{ - text-align: right; - width: 30%; - padding: 5px; + text-align: right; + width: 30%; + padding: 5px; } .data-column{ - text-align: left; - width: 70%; + text-align: left; + width: 70%; } .buttons-section{ - text-align: center; + text-align: center; } .button-section-padding { - padding-top: 10px; + padding-top: 10px; } .org-type-fieldset { - padding-left:200px; - border:1px solid #CCCCCC; - background-color:#FFFFFF; - text-align: left; + padding-left:200px; + border:1px solid #CCCCCC; + background-color:#FFFFFF; + text-align: left; } .org-type-fieldset>input{ - margin: 4px; + margin: 4px; } - + .header-corner { - background: url(../images/corner-r.gif) no-repeat; + background: url(../images/corner-r.gif) no-repeat; } .right_menu_empty { @@ -1229,25 +1236,25 @@ div.footer { color: #376091; } .frozen{ - width:15px; - height:15px; - background-color:red; - float: left; - margin-right:5px; + width:15px; + height:15px; + background-color:red; + float: left; + margin-right:5px; } .unfrozen{ - width:15px; - height:15px; - background-color:green; - float: left; - margin-right:5px; + width:15px; + height:15px; + background-color:green; + float: left; + margin-right:5px; } .legend-item { - float:left;width:20%; - margin-top:10px; - clear:both; + float:left;width:20%; + margin-top:10px; + clear:both; } .summary-change-container { @@ -1430,6 +1437,6 @@ div.footer { } .loading-spinner{ - display:block; + display:block; margin:auto; } \ No newline at end of file diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/index.html b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/index.html index a055e066d7f..8b54ef0538e 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/index.html +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/index.html @@ -6,10 +6,10 @@ Aid Management Platform - Dashboards - + - + diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-model-base.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-model-base.js index 17fcabe2bfb..a5c740f9c24 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-model-base.js +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-model-base.js @@ -30,6 +30,11 @@ module.exports = BackboneDash.Model.extend({ // TODO adjtype hard-coding key for now, should get from settings... data.settings = _({}).extend(data.settings, {'funding-type': this.get('adjtype')}); } + + if (this.get('programType') && this.get('showProgramType') === true) { + data.settings = _({}).extend(data.settings, {'program-settings': this.get('programType')}); + } + _.defaults(data.settings,{ 'currency-code': this.app.settingsWidget.definitions.getDefaultCurrencyId()}); options.data = JSON.stringify(data); return BackboneDash.Model.prototype.fetch.call(this, options); diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-tops.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-tops.js index 5547338fb5f..d86de58af31 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-tops.js +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-tops.js @@ -10,10 +10,11 @@ module.exports = ChartModel.extend({ limit: 5, title: '', bigN: 0, - chartType: 'top' + chartType: 'top', + showProgramType: false }, - _prepareTranslations: function() { + _prepareTranslations: function () { var topBaseLanguage = {}; /* Prepare the translations for the chart */ @@ -29,28 +30,32 @@ module.exports = ChartModel.extend({ topBaseLanguage[chartName + 'others'] = 'Others'; this.localizedTopChart = this.app.translator.translateList(topBaseLanguage) - .done(_(function(localizedTopChartKeyVal) { + .done(_(function (localizedTopChartKeyVal) { this.localizedLookup = localizedTopChartKeyVal; }).bind(this)); + + if (this.get('name') === 'Top Programs') { + this.set('showProgramType', true); + } }, - parse: function(data) { - this.set('title', data.title); - + parse: function (data) { + this.set('title', data.title); + if (!this.localizedLookup) { // we can't procede if we don't have translations yet :( // this code should now be unreachable, but y'never know... this.app.report('Loading error', [ - 'Translations for the application were not loaded before rendering']); + 'Translations for the application were not loaded before rendering']); } var chartName = ['amp.dashboard:chart-', this.get('name').replace(/ /g, ''), '-'].join(''); this.localizedOthers = this.localizedLookup[chartName + 'others']; if (this.localizedOthers === undefined) { - console.error('missing translation in .json file: ' + chartName + 'others'); + console.error('missing translation in .json file: ' + chartName + 'others'); } - var values = _(data.values.slice()).map(function(v) { + var values = _(data.values.slice()).map(function (v) { var cleanName = v.name.replace(/[ :.]/g, ''); var localizedName = v.name; if (this.localizedLookup[chartName + cleanName]) { @@ -69,33 +74,33 @@ module.exports = ChartModel.extend({ if (_(_(values).pluck('x')).uniq().length < values.length) { this.app.report('Data Error', ['The data for ' + this.get('name') + ' was inconsistent due to duplicate keys', - 'The chart will be shown, but it may have errors or other issues as a result.']); + 'The chart will be shown, but it may have errors or other issues as a result.']); } - if (data.maxLimit > values.length) { - var other = { - x: this.localizedOthers, - y: data.total - // total minus the sum of what we have - _.chain(values).pluck('y').reduce(function(l, r) { return l + r; }, 0).value(), - color: '#777', - special: 'others' - }; - //AMP-18740: We changed the EP to send raw numbers expressed in units so we need to apply the GS here. - other.z = common.formatNumber(other.y / app.generalSettings.numberDivider); - - var isRtl = app.generalSettings.get("rtl-direction"); - if (isRtl) { - values.unshift(other); - } else { - values.push(other); - } + if (data.maxLimit > values.length) { + var other = { + x: this.localizedOthers, + y: data.total - // total minus the sum of what we have + _.chain(values).pluck('y').reduce(function (l, r) { return l + r; }, 0).value(), + color: '#777', + special: 'others' + }; + //AMP-18740: We changed the EP to send raw numbers expressed in units so we need to apply the GS here. + other.z = common.formatNumber(other.y / app.generalSettings.numberDivider); + + var isRtl = app.generalSettings.get("rtl-direction"); + if (isRtl) { + values.unshift(other); + } else { + values.push(other); + } } - data.processed = [{values: values}]; + data.processed = [{ values: values }]; return data; }, - fetch: function(options) { + fetch: function (options) { options = _.defaults( options || {}, { url: this.url + '?' + param(this.pick('limit')) }); diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html index 8eacfa31f90..4457582e053 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html @@ -16,7 +16,7 @@

<% <% } %> - +

@@ -66,16 +66,25 @@

- <% if (model.get('adjtype') && model.get('showMeasuresSelector') === true) { %> -
- - -
- <% } %> - + <% if (model.get('adjtype') && model.get('showMeasuresSelector') === true) { %> +
+ + +
+ <% } %> + + <% if (model.get('programType') && model.get('showProgramType') === true) { %> +
+ + +
+ <% } %> + <% if (model.get('chartType') === 'fragmentation') { %>
- - -
- - -
- - - - @@ -1324,7 +1330,7 @@
- -
    - -
  • - - +
    Account information / about you
    + + + + - - +

    + + + + +
    + + + + You have been granted the right to access these + applications and the information contained in them to facilitate + your official business. Your accounts and passwords are your + responsibility. Do not share them with anyone. - - - - - -
    + + + + + + + + - -
    + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    All fields marked with an * are required. - Please use a valid e-mail address.
     
    * - First Name  * - Last Name
    * - E-mail Address -  * - Repeat Email Address
    * - Password - -  * - Repeat Password
    - - Use different email for email notifications - -   - - -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +
    + +
      + +
    • + + + +
    • +
      +
    +
    + +
    All fields marked with an * are required. + Please use a valid e-mail address.
     
    * + First Name +
    + * + Last Name +
    +
    + +
    +
    * + E-mail Address + * + Repeat Email Address
    * + Password + + * + Repeat Password
    + + Use different email for email notifications + + + + + - + - -
    * Notification Email - + -
    -
    * - Country of Residence - - - -  Mailing Address
    * - Organization Type - -- - Select a type - -- - -
    * - Organization Group - -- - Select a group - -- - - - -
    * - Organization Name - - -- - Select an organization - -- - - - -
    Your language settings - - -
       - Submit - - - - - Reset - - -
     
    Your language settings + + +
       + + + Submit + + + + +<%-- Reset Button --%> + + + Reset + + + + +
     
    +
      - - - - - - - - - - -
     
    - - You are signing-in to one or more secure applications for - - official business. You have been granted the right to access these - - applications and the information contained in them to facilitate - - your official business. Your accounts and passwords are your - - responsibility. Do not share them with anyone. - -
    -
    -
     
    -
    -
    -
    + - diff --git a/amp/repository/aim/view/viewNewAdvancedReport.jsp b/amp/repository/aim/view/viewNewAdvancedReport.jsp index 23c923393d7..259b4a7ca53 100644 --- a/amp/repository/aim/view/viewNewAdvancedReport.jsp +++ b/amp/repository/aim/view/viewNewAdvancedReport.jsp @@ -200,7 +200,7 @@ - +<%// see AMP-30664 for details %> <% counter++; ReportContextData.getFromRequest().setProgressValue(counter); diff --git a/amp/repository/aim/view/workspaceManager.jsp b/amp/repository/aim/view/workspaceManager.jsp index b3d1412d1b4..f4633d872fd 100644 --- a/amp/repository/aim/view/workspaceManager.jsp +++ b/amp/repository/aim/view/workspaceManager.jsp @@ -1029,12 +1029,15 @@ function showDetails() { id = document.getElementsByName('teamId')[0].value; desc = document.getElementsByName('teamName')[0].value; + console.log("id: "+id); if(id===""||desc===""){ alert("Select a Team First"); return; } - - value = document.getElementById('showdataWs').options[document.getElementById('showdataWs').selectedIndex].value; + + + value = document.getElementById('showdataWs').options[document.getElementById('showdataWs').selectedIndex].value;; + console.log(value) if(value==0){ showTeamMembers(document.getElementsByName('teamId')[0].value, document.getElementById('teamTitle').value); } @@ -1299,10 +1302,13 @@
  Select:  -     + + + +<%-- --%>
- + diff --git a/amp/src/test/java/org/digijava/kernel/ampapi/endpoints/activity/TestActivityService.java b/amp/src/test/java/org/digijava/kernel/ampapi/endpoints/activity/TestActivityService.java index 04a5d6bb081..64636e56efa 100644 --- a/amp/src/test/java/org/digijava/kernel/ampapi/endpoints/activity/TestActivityService.java +++ b/amp/src/test/java/org/digijava/kernel/ampapi/endpoints/activity/TestActivityService.java @@ -50,8 +50,9 @@ public AmpActivityVersion getActivity(Long activityId) { @Override public AmpActivityVersion saveActivity(AmpActivityVersion newActivity, List translations, - AmpTeamMember modifiedBy, boolean draftChange, SaveContext saveContext, - EditorStore editorStore, Site site) { + List cumulativeTranslations, + AmpTeamMember modifiedBy, boolean draftChange, SaveContext saveContext, + EditorStore editorStore, Site site) { return newActivity; } diff --git a/amp/xmlpatches/3.5.05.1/AMP-30316-remove-amp-analytical-report.xml b/amp/xmlpatches/3.5.05.1/AMP-30316-remove-amp-analytical-report.xml new file mode 100644 index 00000000000..91ed6b062e2 --- /dev/null +++ b/amp/xmlpatches/3.5.05.1/AMP-30316-remove-amp-analytical-report.xml @@ -0,0 +1,15 @@ + + + AMP-30316 + Remove amp analitycal report table + drychter + + + + \ No newline at end of file diff --git a/amp/xmlpatches/3.5.05.1/AMP-30363-remove-IATI-tool-by-updating-amp-visibility-rule.xml b/amp/xmlpatches/3.5.05.1/AMP-30363-remove-IATI-tool-by-updating-amp-visibility-rule.xml new file mode 100644 index 00000000000..94dedde630c --- /dev/null +++ b/amp/xmlpatches/3.5.05.1/AMP-30363-remove-IATI-tool-by-updating-amp-visibility-rule.xml @@ -0,0 +1,16 @@ + + + AMP-30363 + remove iati importer url + timothymugo + + + + \ No newline at end of file diff --git a/amp/xmlpatches/3.5.05.1/AMP-30372-add-hide-document-setting.xml b/amp/xmlpatches/3.5.05.1/AMP-30372-add-hide-document-setting.xml new file mode 100644 index 00000000000..b6aa60f0388 --- /dev/null +++ b/amp/xmlpatches/3.5.05.1/AMP-30372-add-hide-document-setting.xml @@ -0,0 +1,36 @@ + + + AMP-30372 + Add hide document settings + jdeanquin + + + + \ No newline at end of file diff --git a/amp/xmlpatches/3.5.05.1/AMP-30372-organization-exempt-document-permsion-AP-global-setting.xml b/amp/xmlpatches/3.5.05.1/AMP-30372-organization-exempt-document-permsion-AP-global-setting.xml new file mode 100644 index 00000000000..2b78aa12125 --- /dev/null +++ b/amp/xmlpatches/3.5.05.1/AMP-30372-organization-exempt-document-permsion-AP-global-setting.xml @@ -0,0 +1,18 @@ + + + AMP-30372 + organization excempt display document AP + drychter + + + + \ No newline at end of file diff --git a/amp/xmlpatches/3.5.05.1/AMP-30380-update-user-id-field-to-be-capitalized-in-the-cpform.xml b/amp/xmlpatches/3.5.05.1/AMP-30380-update-user-id-field-to-be-capitalized-in-the-cpform.xml new file mode 100644 index 00000000000..a41b3bebd90 --- /dev/null +++ b/amp/xmlpatches/3.5.05.1/AMP-30380-update-user-id-field-to-be-capitalized-in-the-cpform.xml @@ -0,0 +1,16 @@ + + + AMP-30363 + Update User Id and Confirm new Password field to set the Id to be all capitalized to show in the cpForm + timothymugo + + + + \ No newline at end of file diff --git a/amp/xmlpatches/3.5.05.1/AMP-30423-update-empty-gs-lat-and-long-to-null.xml b/amp/xmlpatches/3.5.05.1/AMP-30423-update-empty-gs-lat-and-long-to-null.xml new file mode 100644 index 00000000000..baac6bd3c67 --- /dev/null +++ b/amp/xmlpatches/3.5.05.1/AMP-30423-update-empty-gs-lat-and-long-to-null.xml @@ -0,0 +1,15 @@ + + + AMP-30363 + Update gs_long and gs_lat to null if it is empty + timothymugo + + + + \ No newline at end of file diff --git a/amp/xmlpatches/3.5.05.1/AMP-30424-update-amount-in-thousands-setting.xml b/amp/xmlpatches/3.5.05.1/AMP-30424-update-amount-in-thousands-setting.xml new file mode 100644 index 00000000000..c7e072dce06 --- /dev/null +++ b/amp/xmlpatches/3.5.05.1/AMP-30424-update-amount-in-thousands-setting.xml @@ -0,0 +1,45 @@ + + + AMP-30424 + Update amount in thousands possible value to v_g_settings_amount_units view + timothymugo + + + + \ No newline at end of file diff --git a/amp/xmlpatches/3.5.05.1/AMP-30464-fix-dashboards-fm-entries.xml b/amp/xmlpatches/3.5.05.1/AMP-30464-fix-dashboards-fm-entries.xml new file mode 100644 index 00000000000..f21ed11484b --- /dev/null +++ b/amp/xmlpatches/3.5.05.1/AMP-30464-fix-dashboards-fm-entries.xml @@ -0,0 +1,151 @@ + + + AMP-30464 + Fix dashboards FM Entires + jdeanquin + + + + \ No newline at end of file diff --git a/amp/xmlpatches/3.5.05.1/AMP-30515-Add-hide-empty-total-settings.xml b/amp/xmlpatches/3.5.05.1/AMP-30515-Add-hide-empty-total-settings.xml new file mode 100644 index 00000000000..f893da74729 --- /dev/null +++ b/amp/xmlpatches/3.5.05.1/AMP-30515-Add-hide-empty-total-settings.xml @@ -0,0 +1,54 @@ + + + AMP-30515 + Add hide empty total settings + drychter + + + + \ No newline at end of file diff --git a/amp/xmlpatches/3.5.05.1/AMP-30546-create-top-programs-chart.xml b/amp/xmlpatches/3.5.05.1/AMP-30546-create-top-programs-chart.xml new file mode 100644 index 00000000000..da693bcaf0f --- /dev/null +++ b/amp/xmlpatches/3.5.05.1/AMP-30546-create-top-programs-chart.xml @@ -0,0 +1,16 @@ + + + AMP-30546 + Add top programs chart to feature visibility + timothymugo + + + + \ No newline at end of file diff --git a/amp/xmlpatches/3.5.05.1/AMP-30738-v_nationalobjectives_code-recreate-view.xml b/amp/xmlpatches/3.5.05.1/AMP-30738-v_nationalobjectives_code-recreate-view.xml new file mode 100644 index 00000000000..b4f9869217d --- /dev/null +++ b/amp/xmlpatches/3.5.05.1/AMP-30738-v_nationalobjectives_code-recreate-view.xml @@ -0,0 +1,16 @@ + + + AMP-30738 + Views + jdeanquin + recreate all views because new v_nationalobjectives_code view was created + + + + \ No newline at end of file diff --git a/amp/xmlpatches/general/views/v_nationalobjectives_code.xml b/amp/xmlpatches/general/views/v_nationalobjectives_code.xml new file mode 100644 index 00000000000..e341f2c6969 --- /dev/null +++ b/amp/xmlpatches/general/views/v_nationalobjectives_code.xml @@ -0,0 +1,32 @@ + + + AMP-30738 + Views + Julian de Anquin + recreate view, this will always be the last version of the view + + + + val.equalsIgnoreCase("true") + + + + + +
diff --git a/amp/repository/um/view/viewEditUser.jsp b/amp/repository/um/view/viewEditUser.jsp index 012b697e809..114adca969c 100644 --- a/amp/repository/um/view/viewEditUser.jsp +++ b/amp/repository/um/view/viewEditUser.jsp @@ -69,6 +69,9 @@ function goAction(value){ return false; } } + if (!confirm("Are you sure you want to perform this action?. Confirming the deletion the assignment will be deleted")) { + return false + } } if(submitForm==true){ document.getElementById("event").value=value; @@ -437,11 +440,11 @@ function validateUserInfo(){
- + - +