Merge pull request #421 from eclipse/kaybee-ui

UI changes for Kaybee Assessment
eclipse · Aug 28, 2020 · c231f99 · c231f99
2 parents 06f6c52 + c7401ba
commit c231f99
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/frontend-bugs/src/main/webapp/model/Formatter.js b/frontend-bugs/src/main/webapp/model/Formatter.js
@@ -358,6 +358,9 @@ model.Formatter = {
             	return "";
         },
 
+        showImageKaybee : function(affected){
+            return model.Formatter.showImagePE(null, affected);
+        },
         tooltipPEFormatter : function (ff,lv,fi,ti,c,pc){
             var s = "";
 

diff --git a/frontend-bugs/src/main/webapp/view/Component.controller.js b/frontend-bugs/src/main/webapp/view/Component.controller.js
@@ -190,9 +190,6 @@ sap.ui.controller(
 												case "CHECK_VERSION":
 													lib.checkvers = affectedVersions[x].affected;
 													break;
-												case "PRE_COMMIT_POM":
-													lib.precommitpom = affectedVersions[x].affected;
-													break;
 												case "AST_EQUALITY":
 												case "MINOR_EQUALITY":
 												case "MAJOR_EQUALITY":
@@ -217,6 +214,9 @@ sap.ui.controller(
 													lib.sourcesAvailable=affectedVersions[x].sourcesAvailable;
 													lib.patcheval = affectedVersions[x].source;
 													break;
+												case "KAYBEE":
+													lib.kaybee = affectedVersions[x].affected;
+													break;
 												}	
 												newlibraries.splice(u, 1, lib);
 												break;

diff --git a/frontend-bugs/src/main/webapp/view/Component.view.xml b/frontend-bugs/src/main/webapp/view/Component.view.xml
@@ -214,7 +214,7 @@
                                 </Column>
                                 <Column xmlns="sap.ui.table" width="10%" mergeDuplicates="false" 
                                         sorted="true" sortProperty="manual" >
-                                    <Label text="Assessment (Manual)" xmlns="sap.ui.commons" />
+                                    <Label text="Assessment (Manual)" tooltip="Assessment done Manually" xmlns="sap.ui.commons" />
                                     <template>
                                         <!--<FlexBox xmlns="sap.m" alignItems="Start" justifyContent="SpaceBetween">
                                         <items>
@@ -247,8 +247,16 @@
                                         </SegmentedButton>
                                     </template>
                                 </Column>
-                                <Column xmlns="sap.ui.table" width="10%" mergeDuplicates="false">
-                                    <Label text="Patch eval" 
+                                <Column xmlns="sap.ui.table" width="7%" mergeDuplicates="false">
+                                  <Label text="Assessment (Kaybee)" tooltip= "Assessment done with Kaybee Importer" xmlns="sap.ui.commons" />
+                                  <template>
+                                    <Image xmlns="sap.m" decorative="true" src="{ path:'kaybee', width:'15%', formatter: 'model.Formatter.showImageKaybee' }">
+                                    </Image>
+                                  </template>
+                                </Column>
+                                <Column xmlns="sap.ui.table" width="7%" mergeDuplicates="false">
+                                    <Label text="Assessment (Patch eval)"
+                                           tooltip= "Assessment done with Patch Library Analyzer"
                                         xmlns="sap.ui.commons" />
                                     <template>
                                         <m:MatrixLayout columns="1">
@@ -289,9 +297,9 @@
 <!-- 										</template> -->
 <!--                                 </Column> -->
 
-                                <Column xmlns="sap.ui.table" width="3%" mergeDuplicates="false" 
+                                <Column xmlns="sap.ui.table" width="7%" mergeDuplicates="false"
                                         sorted="true" sortProperty="checkvers">
-                                    <Label text="Assessment (Code)" xmlns="sap.ui.commons" />
+                                    <Label text="Assessment (Code)" xmlns="sap.ui.commons" tooltip= "Assessment done with Check Code"  />
                                     <template>
                                         <l:HorizontalLayout>
                                             <Image xmlns="sap.ui.commons" src="img/linkimage.png"
@@ -302,16 +310,6 @@
                                         </l:HorizontalLayout> 
                                     </template>
                                 </Column>
-                                <Column xmlns="sap.ui.table" width="1%" mergeDuplicates="false" 
-                                        sorted="true" sortProperty="precommitpom">
-                                    <Label text="Pre commit pom" xmlns="sap.ui.commons" />
-                                        <template>
-                                            <TextView xmlns="sap.ui.commons" wrapping="true"
-                                                text="{precommitpom}"
-                                                semanticColor="{path: 'precommitpom', formatter: 'model.Formatter.rowColorForArchives'}">
-                                            </TextView>
-                                        </template>
-                                </Column>
                             </columns>
                         </Table>   
                                 </IconTabFilter>