Project

General

Profile

« Previous | Next » 

Revision 50029

Moved the browse validation history to the proper menu and created an empty placeholder for the monitoring

View differences:

modules/uoa-repository-manager-gui/trunk/src/main/java/eu/dnetlib/repo/manager/client/monitor/MonitorController.java
1
package eu.dnetlib.repo.manager.client.monitor;
2

  
3
import com.google.gwt.user.client.ui.FlowPanel;
4
import eu.dnetlib.repo.manager.client.TokenController;
5

  
6
/**
7
 * Created by stefania on 11/30/17.
8
 */
9
public class MonitorController extends TokenController {
10

  
11
    private MonitorWidget monitorWidget = new MonitorWidget();
12

  
13
    private static MonitorController instance = null;
14

  
15
    public static MonitorController getInstance() {
16
        if (instance == null)
17
            instance = new MonitorController();
18

  
19
        return instance;
20
    }
21

  
22
    @Override
23
    public void showWidget(FlowPanel contentPanel, String parent, String rest) {
24

  
25
        if (rest == null)
26
            redrawWidget(contentPanel, monitorWidget, parent, rest);
27
        else {
28
//            redrawWidget(contentPanel, viewJobDetailsWidget, parent, rest);
29
        }
30
    }
31

  
32
//    @Override
33
//    public void drawHeader(String rest) {
34
//
35
//        RootPanel.get("pageHeader").addStyleName("row wrapper border-bottom white-bg page-heading");
36
//        if (rest == null) {
37
//            RepositoryManager.pageHeader.clear();
38
//            RepositoryManager.pageHeader.add(new HTML("<div class=\"col-sm-9\"><h2>Browse Validation History</h2><ol class=\"breadcrumb\">" +
39
//                    "<li><a href=\"#dashboard\">Home</a></li><li class=\"active\"><strong>Browse Validation History</strong></li></ol></div>"));
40
//        } else {
41
//            RepositoryManager.pageHeader.clear();
42
//            RepositoryManager.pageHeader.add(new HTML("<div class=\"col-sm-9\"><h2>View Validation Job Details</h2><ol class=\"breadcrumb\">" +
43
//                    "<li><a href=\"#dashboard\">Home</a></li><li><a href=\"#browseHistory\">Browse History</a></li>" +
44
//                    "<li class=\"active\"><strong>View Job Details</strong></li></ol></div>"));
45
//        }
46
//    }
47

  
48
    @Override
49
    public String[] getMenuPath(String parent, String rest) {
50
        return new String[] {"monitor"};
51
    }
52
}
modules/uoa-repository-manager-gui/trunk/src/main/java/eu/dnetlib/repo/manager/client/monitor/MonitorWidget.java
1
package eu.dnetlib.repo.manager.client.monitor;
2

  
3
import com.google.gwt.core.client.GWT;
4
import com.google.gwt.dom.client.Document;
5
import com.google.gwt.user.client.ui.FlowPanel;
6
import com.google.gwt.user.client.ui.HTML;
7
import eu.dnetlib.gwt.client.help.HelpService;
8
import eu.dnetlib.gwt.client.help.HelpServiceAsync;
9
import eu.dnetlib.repo.manager.client.AbstractRepositoryManagerWidget;
10
import eu.dnetlib.repo.manager.client.HelpCallback;
11
import eu.dnetlib.repo.manager.client.RepositoryManagerWidget;
12
import eu.dnetlib.repo.manager.client.services.RepositoryService;
13
import eu.dnetlib.repo.manager.client.services.RepositoryServiceAsync;
14
import org.gwtbootstrap3.client.ui.Alert;
15
import org.gwtbootstrap3.client.ui.constants.AlertType;
16

  
17
/**
18
 * Created by stefania on 11/30/17.
19
 */
20
public class MonitorWidget extends AbstractRepositoryManagerWidget implements RepositoryManagerWidget {
21

  
22
    private String parentToken = "";
23
    private String restToken = "";
24

  
25
    private Alert errorAlert = new Alert();
26

  
27
    private FlowPanel monitorContent = new FlowPanel();
28

  
29
    private static HelpServiceAsync helpService = GWT.create(HelpService.class);
30
    private RepositoryServiceAsync repositoryService = GWT.create(RepositoryService.class);
31

  
32
    public MonitorWidget() {
33

  
34
        super();
35

  
36
        HTML title = new HTML("<h1 class=\"uk-article-title\">Monitor</h1>");
37
        title.addStyleName("uk-margin-medium-bottom");
38
        contentPanel.add(title);
39

  
40
        errorAlert.setType(AlertType.DANGER);
41
        errorAlert.setDismissable(false);
42
        errorAlert.setVisible(false);
43
        contentPanel.add(errorAlert);
44

  
45
        contentPanel.add(monitorContent);
46
    }
47

  
48
    @Override
49
    public void clear() {
50
        monitorContent.clear();
51
        errorAlert.setVisible(false);
52
        gridPanel.remove(helpPanel);
53
    }
54

  
55
    @Override
56
    public void reload() {
57

  
58
        errorAlert.setVisible(false);
59

  
60
        Document.get().getElementById("headerNoTransparent").removeClassName("tm-header-transparent");
61

  
62
        helpService.getHelpById(parentToken, new HelpCallback(helpPanel, gridPanel));
63

  
64
        HTML comingSoon = new HTML("Coming soon...");
65
        monitorContent.add(comingSoon);
66

  
67
//        final HTML loadingWheel = new HTML("<div class=\"loader-big\" style=\"text-align: center; padding-top: 170px; " +
68
//                "color: rgb(47, 64, 80); font-weight: bold;\">Retrieving repositories...</div>" +
69
//                "<div class=\"whiteFilm\"></div>");
70
//        getImpactContent.addStyleName("loading-big");
71
//        getImpactContent.add(loadingWheel);
72
    }
73

  
74
    @Override
75
    public void setToken(String parentToken, String rest) {
76
        this.parentToken = parentToken;
77
        this.restToken = rest;
78
    }
79

  
80
    @Override
81
    public void afterAdditionToRootPanel() {
82

  
83
    }
84
}
modules/uoa-repository-manager-gui/trunk/src/main/java/eu/dnetlib/repo/manager/client/RepositoryManagerController.java
12 12
import eu.dnetlib.repo.manager.client.enrichcontent.EnrichContentController;
13 13
import eu.dnetlib.repo.manager.client.getimpact.GetImpactController;
14 14
import eu.dnetlib.repo.manager.client.admin.helptexts.HelpTextsAdminController;
15
import eu.dnetlib.repo.manager.client.monitor.MonitorController;
15 16
import eu.dnetlib.repo.manager.client.validator.test.RunCompatibilityTestController;
16 17

  
17 18
import static com.google.gwt.query.client.GQuery.$;
......
38 39
        subControllers.put("manageDatasource", DatasourceUpdateController.getInstance());
39 40
        subControllers.put("validate", RunCompatibilityTestController.getInstance());
40 41
        subControllers.put("browseHistory", BrowseHistoryController.getInstance());
42
        subControllers.put("monitor", MonitorController.getInstance());
41 43
        subControllers.put("helpAdmin", HelpTextsAdminController.getInstance());
42 44
        subControllers.put("enrichContent", EnrichContentController.getInstance());
43 45
        subControllers.put("getImpact", GetImpactController.getInstance());
modules/uoa-repository-manager-gui/trunk/src/main/webapp/RepositoryManager.html
1007 1007
        </div>
1008 1008

  
1009 1009

  
1010
        <!--<div class="uk-section-primary uk-section uk-section-small uk-padding-remove-bottom">-->
1011
            <!--<div class="uk-container">-->
1012
                <!--<div class="uk-grid-margin uk-grid" uk-grid="">-->
1013
                    <!--<div class="uk-width-expand@m uk-light uk-first-column">-->
1014
                        <!--<div class="uk-margin">-->
1015
                            <!--<div class="uk-child-width-auto uk-grid-small uk-grid" uk-grid="">-->
1016
                                <!--<div class="uk-first-column">-->
1017
                                    <!--<a uk-icon="icon: facebook" href="http://www.facebook.com/groups/openaire/"-->
1018
                                       <!--target="_blank" class="el-link uk-icon-link uk-icon">-->
1019
                                        <!--<svg width="20" height="20" viewBox="0 0 20 20"-->
1020
                                             <!--xmlns="http://www.w3.org/2000/svg" icon="facebook" ratio="1">-->
1021
                                            <!--<path d="M11,10h2.6l0.4-3H11V5.3c0-0.9,0.2-1.5,1.5-1.5H14V1.1c-0.3,0-1-0.1-2.1-0.1C9.6,1,8,2.4,8,5v2H5.5v3H8v8h3V10z"/>-->
1022
                                        <!--</svg>-->
1023
                                    <!--</a>-->
1024
                                <!--</div>-->
1025
                                <!--<div>-->
1026
                                    <!--<a uk-icon="icon: twitter" href="http://www.twitter.com/OpenAIRE_eu" target="_blank"-->
1027
                                       <!--class="el-link uk-icon-link uk-icon">-->
1028
                                        <!--<svg width="20" height="20" viewBox="0 0 20 20"-->
1029
                                             <!--xmlns="http://www.w3.org/2000/svg" icon="twitter" ratio="1">-->
1030
                                            <!--<path d="M19,4.74 C18.339,5.029 17.626,5.229 16.881,5.32 C17.644,4.86 18.227,4.139 18.503,3.28 C17.79,3.7 17.001,4.009 16.159,4.17 C15.485,3.45 14.526,3 13.464,3 C11.423,3 9.771,4.66 9.771,6.7 C9.771,6.99 9.804,7.269 9.868,7.539 C6.795,7.38 4.076,5.919 2.254,3.679 C1.936,4.219 1.754,4.86 1.754,5.539 C1.754,6.82 2.405,7.95 3.397,8.61 C2.79,8.589 2.22,8.429 1.723,8.149 L1.723,8.189 C1.723,9.978 2.997,11.478 4.686,11.82 C4.376,11.899 4.049,11.939 3.713,11.939 C3.475,11.939 3.245,11.919 3.018,11.88 C3.49,13.349 4.852,14.419 6.469,14.449 C5.205,15.429 3.612,16.019 1.882,16.019 C1.583,16.019 1.29,16.009 1,15.969 C2.635,17.019 4.576,17.629 6.662,17.629 C13.454,17.629 17.17,12 17.17,7.129 C17.17,6.969 17.166,6.809 17.157,6.649 C17.879,6.129 18.504,5.478 19,4.74"/>-->
1031
                                        <!--</svg>-->
1032
                                    <!--</a>-->
1033
                                <!--</div>-->
1034
                                <!--<div>-->
1035
                                    <!--<a uk-icon="icon: linkedin" href="http://www.linkedin.com/groups/OpenAIRE-3893548"-->
1036
                                       <!--target="_blank" class="el-link uk-icon-link uk-icon">-->
1037
                                        <!--<svg width="20" height="20" viewBox="0 0 20 20"-->
1038
                                             <!--xmlns="http://www.w3.org/2000/svg" icon="linkedin" ratio="1">-->
1039
                                            <!--<path d="M5.77,17.89 L5.77,7.17 L2.21,7.17 L2.21,17.89 L5.77,17.89 L5.77,17.89 Z M3.99,5.71 C5.23,5.71 6.01,4.89 6.01,3.86 C5.99,2.8 5.24,2 4.02,2 C2.8,2 2,2.8 2,3.85 C2,4.88 2.77,5.7 3.97,5.7 L3.99,5.7 L3.99,5.71 L3.99,5.71 Z"/>-->
1040
                                            <!--<path d="M7.75,17.89 L11.31,17.89 L11.31,11.9 C11.31,11.58 11.33,11.26 11.43,11.03 C11.69,10.39 12.27,9.73 13.26,9.73 C14.55,9.73 15.06,10.71 15.06,12.15 L15.06,17.89 L18.62,17.89 L18.62,11.74 C18.62,8.45 16.86,6.92 14.52,6.92 C12.6,6.92 11.75,7.99 11.28,8.73 L11.3,8.73 L11.3,7.17 L7.75,7.17 C7.79,8.17 7.75,17.89 7.75,17.89 L7.75,17.89 L7.75,17.89 Z"/>-->
1041
                                        <!--</svg>-->
1042
                                    <!--</a>-->
1043
                                <!--</div>-->
1044
                                <!--<div>-->
1045
                                    <!--<a uk-icon="icon: social" href="http://www.slideshare.net/OpenAIRE_eu"-->
1046
                                       <!--target="_blank" class="el-link uk-icon-link uk-icon">-->
1047
                                        <!--<svg width="20" height="20" viewBox="0 0 20 20"-->
1048
                                             <!--xmlns="http://www.w3.org/2000/svg" icon="social" ratio="1">-->
1049
                                            <!--<line fill="none" stroke="#000" stroke-width="1.1" x1="13.4" y1="14"-->
1050
                                                  <!--x2="6.3" y2="10.7"/>-->
1051
                                            <!--<line fill="none" stroke="#000" stroke-width="1.1" x1="13.5" y1="5.5"-->
1052
                                                  <!--x2="6.5" y2="8.8"/>-->
1053
                                            <!--<circle fill="none" stroke="#000" stroke-width="1.1" cx="15.5" cy="4.6"-->
1054
                                                    <!--r="2.3"/>-->
1055
                                            <!--<circle fill="none" stroke="#000" stroke-width="1.1" cx="15.5" cy="14.8"-->
1056
                                                    <!--r="2.3"/>-->
1057
                                            <!--<circle fill="none" stroke="#000" stroke-width="1.1" cx="4.5" cy="9.8"-->
1058
                                                    <!--r="2.3"/>-->
1059
                                        <!--</svg>-->
1060
                                    <!--</a>-->
1061
                                <!--</div>-->
1062
                                <!--<div>-->
1063
                                    <!--<a uk-icon="icon: vimeo" href="http://vimeo.com/openaire" target="_blank"-->
1064
                                       <!--class="el-link uk-icon-link uk-icon">-->
1065
                                        <!--<svg width="20" height="20" viewBox="0 0 20 20"-->
1066
                                             <!--xmlns="http://www.w3.org/2000/svg" icon="vimeo" ratio="1">-->
1067
                                            <!--<path d="M2.065,7.59C1.84,7.367,1.654,7.082,1.468,6.838c-0.332-0.42-0.137-0.411,0.274-0.772c1.026-0.91,2.004-1.896,3.127-2.688 c1.017-0.713,2.365-1.173,3.286-0.039c0.849,1.045,0.869,2.629,1.084,3.891c0.215,1.309,0.421,2.648,0.88,3.901 c0.127,0.352,0.37,1.018,0.81,1.074c0.567,0.078,1.145-0.917,1.408-1.289c0.684-0.987,1.611-2.317,1.494-3.587 c-0.115-1.349-1.572-1.095-2.482-0.773c0.146-1.514,1.555-3.216,2.912-3.792c1.439-0.597,3.579-0.587,4.302,1.036 c0.772,1.759,0.078,3.802-0.763,5.396c-0.918,1.731-2.1,3.333-3.363,4.829c-1.114,1.329-2.432,2.787-4.093,3.422 c-1.897,0.723-3.021-0.686-3.667-2.318c-0.705-1.777-1.056-3.771-1.565-5.621C4.898,8.726,4.644,7.836,4.136,7.191 C3.473,6.358,2.72,7.141,2.065,7.59C1.977,7.502,2.115,7.551,2.065,7.59L2.065,7.59z"/>-->
1068
                                        <!--</svg>-->
1069
                                    <!--</a>-->
1070
                                <!--</div>-->
1071
                            <!--</div>-->
1072
                        <!--</div>-->
1073
                        <!--<div class="uk-margin-medium uk-margin-remove-bottom uk-text-left">-->
1074
                            <!--<img src="http://dl119.madgik.di.uoa.gr/images/Logos/Logo_Horizontal_white_small.png"-->
1075
                                 <!--class="el-image" alt="OpenAIRE">-->
1076
                        <!--</div>-->
1077
                        <!--<div class="newsletter uk-margin uk-margin-remove-bottom uk-text-left uk-panel">-->
1078
                            <!--<h6 class="el-title uk-margin uk-h2">-->
1079
                                <!--Newsletter </h6>-->
1080
                            <!--<a href="/www.cnn.com" class="el-link"><span uk-icon="icon: comments;ratio: 1.5"-->
1081
                                                                         <!--class="el-image uk-icon"><svg width="30"-->
1082
                                                                                                       <!--height="30"-->
1083
                                                                                                       <!--viewBox="0 0 20 20"-->
1084
                                                                                                       <!--xmlns="http://www.w3.org/2000/svg"-->
1085
                                                                                                       <!--icon="comments"-->
1086
                                                                                                       <!--ratio="1.5">-->
1087
                                <!--<polyline fill="none" stroke="#000" points="2 0.5 19.5 0.5 19.5 13"/>-->
1088
                                <!--<path d="M5,19.71 L5,15 L0,15 L0,2 L18,2 L18,15 L9.71,15 L5,19.71 L5,19.71 L5,19.71 Z M1,14 L6,14 L6,17.29 L9.29,14 L17,14 L17,3 L1,3 L1,14 L1,14 L1,14 Z"/>-->
1089
                            <!--</svg></span></a>-->
1090
                        <!--</div>-->
1091
                        <!--<div class="newsletter uk-panel">-->
1092
                        <!--</div>-->
1093
                    <!--</div>-->
1094
                    <!--<div class="uk-width-expand@m uk-light">-->
1095
                        <!--<div>-->
1096
                            <!--<ul class="uk-subnav uk-margin-remove-bottom uk-subnav-divider" uk-margin="">-->
1097
                                <!--<li class="el-item uk-first-column">-->
1098
                                    <!--<a class="el-link" href="/www.cnn.com">About</a>-->
1099
                                <!--</li>-->
1100
                                <!--<li class="el-item">-->
1101
                                    <!--<a class="el-content uk-disabled">Services</a>-->
1102
                                <!--</li>-->
1103
                                <!--<li class="el-item">-->
1104
                                    <!--<a class="el-content uk-disabled">News</a>-->
1105
                                <!--</li>-->
1106
                                <!--<li class="el-item">-->
1107
                                    <!--<a class="el-content uk-disabled">Events</a>-->
1108
                                <!--</li>-->
1109
                                <!--<li class="el-item">-->
1110
                                    <!--<a class="el-content uk-disabled">Blog</a>-->
1111
                                <!--</li>-->
1112
                                <!--<li class="el-item">-->
1113
                                    <!--<a class="el-content uk-disabled">Contact us</a>-->
1114
                                <!--</li>-->
1115
                            <!--</ul>-->
1116
                        <!--</div>-->
1117
                    <!--</div>-->
1118
                <!--</div>-->
1119
            <!--</div>-->
1120
        <!--</div>-->
1121
        <!--<div class="uk-section-primary uk-section uk-section-xsmall uk-padding-remove-bottom">-->
1122
            <!--<div class="uk-container">-->
1123
                <!--<div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">-->
1124
                    <!--<div class="uk-width-1-1@m uk-first-column">-->
1125
                        <!--<div class="footer-license uk-margin uk-margin-remove-bottom uk-text-center uk-text-lead">-->
1126
                            <!--<div><a href="http://creativecommons.org/licenses/by/4.0/" rel="license"><img-->
1127
                                    <!--src="https://i.creativecommons.org/l/by/3.0/80x15.png" alt="Creative"-->
1128
                                    <!--style="height: auto; max-width: 100%; vertical-align: middle;"></a>&nbsp;UNLESS-->
1129
                                <!--OTHERWISE INDICATED, ALL MATERIALS CREATED BY THE OPENAIRE CONSORTIUM ARE LICENSED UNDER-->
1130
                                <!--A&nbsp;<a href="http://creativecommons.org/licenses/by/4.0/" rel="license">CREATIVE-->
1131
                                    <!--COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE</a>.-->
1132
                            <!--</div>-->
1133
                            <!--<div>OPENAIRE IS POWERED BY&nbsp;<a href="http://www.d-net.research-infrastructures.eu/">D-NET</a>.-->
1134
                            <!--</div>-->
1135
                        <!--</div>-->
1136
                        <!--<div class="uk-margin uk-margin-remove-bottom uk-text-center">-->
1137
                            <!--<img src="http://dl119.madgik.di.uoa.gr/templates/yootheme/cache/ec_logo_inv_small-4aa7cf58.png"-->
1138
                                 <!--srcset="/templates/yootheme/cache/ec_logo_inv_small-e4d7de03.png 91w, /templates/yootheme/cache/ec_logo_inv_small-4aa7cf58.png 114w"-->
1139
                                 <!--sizes="(min-width: 114px) 114px, 100vw" class="el-image" alt="European Commission">-->
1140
                        <!--</div>-->
1141
                        <!--<div class="uk-margin uk-margin-remove-top uk-margin-remove-bottom uk-text-right">-->
1142
                            <!--<a href="#" uk-totop="" uk-scroll="" class="uk-totop uk-icon">-->
1143
                                <!--<svg width="15" height="20" viewBox="0 0 15 20" xmlns="http://www.w3.org/2000/svg"-->
1144
                                     <!--icon="totop" ratio="1">-->
1145
                                    <!--<polyline fill="none" stroke="#0000" stroke-width="1.1" points="1,8 7.5,1.5 14,8 "/>-->
1146
                                    <!--<rect fill="000" x="7" y="2" width="1" height="20"/>-->
1147
                                <!--</svg>-->
1148
                            <!--</a>-->
1149
                        <!--</div>-->
1150
                    <!--</div>-->
1151
                <!--</div>-->
1152
            <!--</div>-->
1153
        <!--</div>-->
1154

  
1155

  
1156 1010
    </div>
1157 1011
</div>
1158 1012

  
......
1243 1097
                                    <li class="uk-nav-header uk-parent">Compatibility
1244 1098
                                        <ul class="uk-nav-sub">
1245 1099
                                            <li>
1246
                                                <a href="#validate">Validation</a>
1100
                                                <a href="#validate">Validate</a>
1247 1101
                                            </li>
1248 1102
                                            <li>
1249
                                                <a href="#browseHistory">Monitor</a>
1103
                                                <a href="#browseHistory">Browse History</a>
1250 1104
                                            </li>
1105
                                            <li>
1106
                                                <a href="#monitor">Monitor</a>
1107
                                            </li>
1251 1108
                                        </ul>
1252 1109
                                    </li>
1253 1110
                                    <li class="uk-nav-header uk-parent">Content
......
1377 1234
                                            <div class="uk-first-column">
1378 1235
                                                <ul class="uk-nav uk-navbar-dropdown-nav">
1379 1236
                                                    <li>
1380
                                                        <a href="#validate">Validation</a>
1237
                                                        <a href="#validate">Validate</a>
1381 1238
                                                    </li>
1382 1239
                                                    <li>
1383
                                                        <a href="#browseHistory">Monitor</a>
1240
                                                        <a href="#browseHistory">Browse History</a>
1384 1241
                                                    </li>
1242
                                                    <li>
1243
                                                        <a href="#monitor">Monitor</a>
1244
                                                    </li>
1385 1245
                                                </ul>
1386 1246
                                            </div>
1387 1247
                                        </div>

Also available in: Unified diff