Project

General

Profile

« Previous | Next » 

Revision 50015

Added by Tsampikos Livisianos over 6 years ago

add COUNTER book reports

View differences:

modules/dnet-openaire-usage-stats-api/src/main/java/eu/dnetlib/usagestats/controllers/CustomWebMvcConfigurerAdapter.java
27 27
        registry.addViewController("/sushilite/JR1").setViewName("redirect:/sushilite/JR1/");
28 28
        registry.addViewController("/sushilite/JR1/").setViewName("forward:/sushilite/JR1/index.html");
29 29

  
30
        registry.addViewController("/sushilite/BR1").setViewName("redirect:/sushilite/BR1/");
31
        registry.addViewController("/sushilite/BR1/").setViewName("forward:/sushilite/BR1/index.html");
32

  
33
        registry.addViewController("/sushilite/BR2").setViewName("redirect:/sushilite/BR2/");
34
        registry.addViewController("/sushilite/BR2/").setViewName("forward:/sushilite/BR2/index.html");
35

  
30 36
        super.addViewControllers(registry);
31 37
    }
32 38
}
modules/dnet-openaire-usage-stats-api/src/main/java/eu/dnetlib/usagestats/sushilite/UsageReport.java
105 105
                if (!itemid.equals("")) {
106 106
                    if (itemDataType.equalsIgnoreCase("") || itemDataType.equalsIgnoreCase("article")) {
107 107
                        executeItem(reportItems, itemIdentifier, repoid, "Article", beginDateParsed, endDateParsed, granularity);
108
                        if (reportItems.isEmpty()) {
109
                            reportExceptions.add(new ReportException("3030", "Error", "No Usage Available for Requested Dates", "Service did not find any data"));
110
                        }
108 111
                    } else {
109 112
                        reportExceptions.add(new ReportException("3030", "Error", "No Usage Available for Requested Dates", "Service did not find any data"));
110 113
                    }
111 114
                } else if (!repoid.equals("")) {
112 115
                    executeBatchItems(reportItems, repoid, "Article", beginDateParsed, endDateParsed, granularity);
116
                    if (reportItems.isEmpty()) {
117
                        reportExceptions.add(new ReportException("3030", "Error", "No Usage Available for Requested Dates", "Service did not find any data"));
118
                    }
113 119
                }
114
                if (reportItems.isEmpty()) {
115
                    reportExceptions.add(new ReportException("3030", "Error", "No Usage Available for Requested Dates", "Service did not find any data"));
120
            }
121
        } else if (reportName.equalsIgnoreCase("br1")) {
122
            if (!itemid.equals("-1") && !repoid.equals("-1") && beginDateParsed != null && endDateParsed != null && beginDateParsed.before(endDateParsed)) {
123
                if (!itemid.equals("")) {
124
                    if (itemDataType.equalsIgnoreCase("") || itemDataType.equalsIgnoreCase("book")) {
125
                        executeItem(reportItems, itemIdentifier, repoid, "Book", beginDateParsed, endDateParsed, granularity);
126
                        if (reportItems.isEmpty()) {
127
                            reportExceptions.add(new ReportException("3030", "Error", "No Usage Available for Requested Dates", "Service did not find any data"));
128
                        }
129
                    } else {
130
                        reportExceptions.add(new ReportException("3030", "Error", "No Usage Available for Requested Dates", "Service did not find any data"));
131
                    }
132
                } else if (!repoid.equals("")) {
133
                    executeBatchItems(reportItems, repoid, "Book", beginDateParsed, endDateParsed, granularity);
134
                    if (reportItems.isEmpty()) {
135
                        reportExceptions.add(new ReportException("3030", "Error", "No Usage Available for Requested Dates", "Service did not find any data"));
136
                    }
116 137
                }
117 138
            }
139
        } else if (reportName.equalsIgnoreCase("br2")) {
140
            if (!itemid.equals("-1") && !repoid.equals("-1") && beginDateParsed != null && endDateParsed != null && beginDateParsed.before(endDateParsed)) {
141
                if (!itemid.equals("")) {
142
                    if (itemDataType.equalsIgnoreCase("") || itemDataType.equalsIgnoreCase("part of book or chapter of book")) {
143
                        executeItem(reportItems, itemIdentifier, repoid, "Part of book or chapter of book", beginDateParsed, endDateParsed, granularity);
144
                        if (reportItems.isEmpty()) {
145
                            reportExceptions.add(new ReportException("3030", "Error", "No Usage Available for Requested Dates", "Service did not find any data"));
146
                        }
147
                    } else {
148
                        reportExceptions.add(new ReportException("3030", "Error", "No Usage Available for Requested Dates", "Service did not find any data"));
149
                    }
150
                } else if (!repoid.equals("")) {
151
                    executeBatchItems(reportItems, repoid, "Part of book or chapter of book", beginDateParsed, endDateParsed, granularity);
152
                    if (reportItems.isEmpty()) {
153
                        reportExceptions.add(new ReportException("3030", "Error", "No Usage Available for Requested Dates", "Service did not find any data"));
154
                    }
155
                }
156
            }
118 157
        } else if (reportName.equalsIgnoreCase("ir1")) {
119 158
            if (!itemid.equals("-1") && !repoid.equals("-1") && beginDateParsed != null && endDateParsed != null && beginDateParsed.before(endDateParsed)) {
120 159
                if (!itemid.equals("")) {
......
143 182
        }else if (reportName.equals("")) {
144 183
            reportExceptions.add(new ReportException("3050", "Error", "Report argument is missing", "You must supply a Report argument"));
145 184
        } else {
146
            reportExceptions.add(new ReportException("3000", "Error", "Report " + reportName + " not supported", "Supported reports: AR1, IR1, RR1"));
185
            reportExceptions.add(new ReportException("3000", "Error", "Report " + reportName + " not supported", "Supported reports: AR1, IR1, RR1, BR1, BR2"));
147 186
        }
148 187

  
149 188

  
modules/dnet-openaire-usage-stats-api/src/main/resources/static/sushilite/BR1/index.html
1
<!DOCTYPE html>
2
<html lang="en-gb" dir="ltr" vocab="http://schema.org/">
3
<head>
4
   <meta charset="utf-8">
5
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
6
   <meta name="viewport" content="width=device-width, initial-scale=1">
7
   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
8
   <meta name="description" content="OpenAIRE  SUSHI Lite Client, open access, research, scientific publication, European Commission,
9
         EC, FP7, ERC, Horizon 2020, H2020, search, projects "/>
10
   <link href="../../assets/favicon.ico" />
11
   <title>OpenAIRE  SUSHI Lite Client</title>
12
   <script  src="../../assets/jquery.js"></script>
13
   <script  src="../../assets/uikit.js"></script>
14
   <script src="../../assets/uikit-icon-max.js"></script>
15
   <link rel="stylesheet" type="text/css" href="../../assets/theme.css">
16
   <link rel="stylesheet" type="text/css" href="../../assets/custom.css">
17
   <link rel="stylesheet" type="text/css" href="../../assets/custom.css.1">
18
</head>
19
<body class="" style="">
20
<div class="uk-offcanvas-content uk-height-viewport">
21
   <!-- MENU STARTS HERE-->
22
   <!-- MAIN MENU  STARTS HERE-->
23
   <div class="tm-header-mobile uk-hidden@m">
24
      <div animation="uk-animation-slide-top" class="uk-navbar-container uk-sticky  uk-navbar-transparent uk-light" cls-active="uk-active uk-navbar-sticky" cls-inactive="uk-navbar-transparent uk-light"  uk-sticky="">
25
         <nav class="uk-navbar-container uk-navbar" uk-navbar="">
26
            <div class="uk-navbar-center">
27
               <a class="uk-logo uk-navbar-item uk-link"   href="https://www.openaire.eu">
28
                  <img src="../../assets/apple-icon-72x72.png" alt="OpenAIRE" class="uk-responsive-height">
29
               </a>
30
               <a class="uk-navbar-item uk-logo uk-padding-remove-left uk-visible@m" href="../../sushilite/" >
31
                  OpenAIRE SUSHI Lite Client</a>
32
               <a class="uk-navbar-item uk-logo uk-padding-remove-left uk-hidden@m"  href="../../sushilite/">
33
                  SUSHI Lite Client</a>
34
            </div>
35
         </nav>
36
      </div>
37
   </div>
38
   <div class="tm-header uk-visible@m tm-header-transparent" uk-header="">
39
      <!-- top=".tm-header" + [class*=&quot;uk-section&quot;] -->
40
      <div animation="uk-animation-slide-top" class="uk-navbar-container uk-sticky  uk-navbar-transparent uk-light" cls-active="uk-active uk-navbar-sticky" cls-inactive="uk-navbar-transparent uk-light" media="768"  uk-sticky="">
41
         <div class="uk-container uk-container-expand">
42
            <nav class="uk-navbar" uk-navbar="{&quot;align&quot;:&quot;left&quot;}" style="background-color:white !important;">
43
               <div class="uk-navbar-center">
44
                  <div class="uk-logo uk-navbar-item uk-margin-small-top">
45
                     <a class="uk-logo uk-navbar-item uk-link"   href="https://www.openaire.eu">
46
                        <img alt="OpenAIRE" class="uk-responsive-height" src="../../assets/Logo_Horizontal.png">
47
                     </a>
48
                  </div>
49
                  <div class="uk-logo uk-navbar-item uk-margin-medium-top">
50
                     <h3 style="color: #767779 !important;"><a class="uk-navbar-item uk-logo"  href="../../sushilite/">
51
                        SUSHI Lite Client</a>
52
                     </h3>
53
                  </div>
54
               </div>
55
            </nav>
56
         </div>
57
      </div>
58
   </div>
59
   <!-- MENU ENDS HERE-->
60
   <div class="first_page_section uk-section-default uk-section uk-padding-remove-vertical">
61
      <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
62
      </div>
63
   </div>
64
   <div id="tm-main" class=" uk-section  uk-margin-large-top tm-middle custom-main-content">
65
      <div uk-grid="" class="uk-grid uk-grid-stack">
66
         <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column">
67
            <div class="uk-container">
68
               <form action="../../sushilite/GetReport/" method="get" class="uk-forml uk-width-1-1@s uk-width-2-3@m  uk-container ">
69
                  <h3>Report Request</h3>
70
                  <div class="uk-grid">
71
                     <div class=" uk-width-1-3 uk-text-right">
72
                        Report Name:
73
                     </div>
74
                     <div class="uk-width-2-3">
75
                        <select name='Report'>
76
                           <option value='BR1'>BR1</option>
77
                        </select>
78
                     </div>
79
                  </div>
80
                  <div class="uk-grid">
81
                     <div class=" uk-width-1-3 uk-text-right">
82
                        Release:
83
                     </div>
84
                     <div class="uk-width-2-3">
85
                        <select name='Release'>
86
                           <option value="4">4</option>
87
                        </select>
88
                     </div>
89
                  </div>
90
                  <div class="uk-grid">
91
                     <div class=" uk-width-1-3 uk-text-right">
92
                        Requestor:
93
                     </div>
94
                     <div class="uk-width-2-3">
95
                        <input type="text" name="RequestorID" value="anonymous">
96
                     </div>
97
                  </div>
98
                  <h3>Report Filters</h3>
99
                  <h5>Date range</h5>
100
                  <p>Valid date formats are yyyy-mm-dd or yyyy-mm. Default range is the last available month.
101
                  </p>
102
                  <div class="uk-grid">
103
                     <div class=" uk-width-1-3 uk-text-right">
104
                        Begin Date:
105
                     </div>
106
                     <div class="uk-width-2-3">
107
                        <input type="text" name="BeginDate" placeholder="2016-03" />
108
                     </div>
109
                  </div>
110
                  <div class="uk-grid">
111
                     <div class=" uk-width-1-3 uk-text-right">
112
                        End Date:
113
                     </div>
114
                     <div class="uk-width-2-3">
115
                        <input type="text" name="EndDate" placeholder="2016-06" />
116
                     </div>
117
                  </div>
118
                  <h5>Filters</h5>
119
                  <p>Provide either a Repository Identifier or an Item Identifier<br />
120
                     Identifier format: <b>namespace:value</b><br />
121
                     Valid namespace for Repository Identifier: <b>openaire</b> or <b>opendoar</b>.<br />
122
                     Valid namespace for Item Identifier: <b>openaire</b>, <b>doi</b> or <b>oid</b>(for OAI-PMH).
123
                  </p>
124
                  <div class="uk-grid">
125
                     <div class=" uk-width-1-3 uk-text-right">
126
                        Repository Identifier:
127
                     </div>
128
                     <div class="uk-width-2-3">
129
                        <input type="text" name="RepositoryIdentifier" placeholder="e.g. opendoar:1503">
130
                     </div>
131
                  </div>
132
                  <div class="uk-grid">
133
                     <div class=" uk-width-1-3 uk-text-right">
134
                        Item Identifier:
135
                     </div>
136
                     <div class="uk-width-2-3">
137
                        <input type="text" name="ItemIdentifier" placeholder="e.g. openaire:od_________::fb90de6f20d79783d05749d8f60417d5">
138
                     </div>
139
                  </div>
140
                  <!--
141
                     //<p>You may also limit the results to include or exclude items that have a DOI<br />
142
                         //Valid values: Yes or No</p>
143
                     //hasDOI:
144
                     //<select name='hasDOI'>
145
                         //<option value="">Not applicable</option>
146
                         //<option value="Yes">Yes</option>
147
                         //<option value="No">No</option>
148
                         //</select>
149

  
150
                     -->
151
                  <h3>Report Attributes</h3>
152
                  <p>Valid Granularity values: Monthly or Totals</p>
153
                  <div class="uk-grid">
154
                     <div class=" uk-width-1-3 uk-text-right">
155
                        Granularity:
156
                     </div>
157
                     <div class="uk-width-2-3">
158
                        <select name='Granularity'>
159
                           <option value="Monthly">Monthly</option>
160
                           <option value="Totals">Totals</option>
161
                        </select>
162
                     </div>
163
                  </div>
164
                  <!--
165
                     //<p>The format in which the response is to be returned defaults to JSON unless a callback function name is entered in which case JSONP is returned.</p>
166
                     //<input type="text" name="Callback">
167
                     -->
168
                  <p>The Pretty attribute is just for humans playing with the API and looking at results in a browser.</p>
169
                  <p><input type="checkbox" name="Pretty" value="Pretty" checked="checked">Pretty print json(p) for humans</p>
170
                  <input type="submit" class="uk-button uk-button-primary" value="Get Report"/>
171
               </form>
172
            </div>
173
         </div>
174
      </div>
175
   </div>
176
   <!-- FOOTER STARTS HERE-->
177
   <div class="custom-footer" style="">
178
      <div class="uk-section-primary uk-section uk-section-small">
179
         <div class="uk-container">
180
            <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
181
               <div class="uk-width-1-1@m uk-first-column">
182
                  <div class="uk-margin uk-margin-remove-top uk-margin-remove-bottom uk-text-center">
183
                     <img alt="OpenAIRE" class="el-image" src="../../assets/Logo_Horizontal_white_small.png">
184
                  </div>
185
                  <div class="footer-license uk-margin uk-margin-remove-bottom uk-text-center uk-text-lead">
186
                     <div><a href="http://creativecommons.org/licenses/by/4.0/" rel="license" target="_blank"><img alt="Creative" src="../../assets/80x15.png" style="height: auto; max-width: 100%; vertical-align: middle;"></a>&nbsp;UNLESS OTHERWISE INDICATED, ALL MATERIALS CREATED BY THE OPENAIRE CONSORTIUM ARE LICENSED UNDER A&nbsp;<a href="http://creativecommons.org/licenses/by/4.0/" rel="license">CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE</a>.</div>
187
                     <div>OPENAIRE IS POWERED BY&nbsp;<a href="http://www.d-net.research-infrastructures.eu/" target="_blank">D-NET</a>.</div>
188
                  </div>
189
                  <div class="uk-margin uk-margin-remove-top uk-margin-remove-bottom uk-text-right">
190
                     <a class="uk-totop uk-icon" href="#" uk-scroll="" uk-totop=""></a>
191
                  </div>
192
               </div>
193
            </div>
194
         </div>
195
      </div>
196
   </div>
197
</div>
198
</body>
199
</html>
modules/dnet-openaire-usage-stats-api/src/main/resources/static/sushilite/BR2/index.html
1
<!DOCTYPE html>
2
<html lang="en-gb" dir="ltr" vocab="http://schema.org/">
3
<head>
4
   <meta charset="utf-8">
5
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
6
   <meta name="viewport" content="width=device-width, initial-scale=1">
7
   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
8
   <meta name="description" content="OpenAIRE  SUSHI Lite Client, open access, research, scientific publication, European Commission,
9
         EC, FP7, ERC, Horizon 2020, H2020, search, projects "/>
10
   <link href="../../assets/favicon.ico" />
11
   <title>OpenAIRE  SUSHI Lite Client</title>
12
   <script  src="../../assets/jquery.js"></script>
13
   <script  src="../../assets/uikit.js"></script>
14
   <script src="../../assets/uikit-icon-max.js"></script>
15
   <link rel="stylesheet" type="text/css" href="../../assets/theme.css">
16
   <link rel="stylesheet" type="text/css" href="../../assets/custom.css">
17
   <link rel="stylesheet" type="text/css" href="../../assets/custom.css.1">
18
</head>
19
<body class="" style="">
20
<div class="uk-offcanvas-content uk-height-viewport">
21
   <!-- MENU STARTS HERE-->
22
   <!-- MAIN MENU  STARTS HERE-->
23
   <div class="tm-header-mobile uk-hidden@m">
24
      <div animation="uk-animation-slide-top" class="uk-navbar-container uk-sticky  uk-navbar-transparent uk-light" cls-active="uk-active uk-navbar-sticky" cls-inactive="uk-navbar-transparent uk-light"  uk-sticky="">
25
         <nav class="uk-navbar-container uk-navbar" uk-navbar="">
26
            <div class="uk-navbar-center">
27
               <a class="uk-logo uk-navbar-item uk-link"   href="https://www.openaire.eu">
28
                  <img src="../../assets/apple-icon-72x72.png" alt="OpenAIRE" class="uk-responsive-height">
29
               </a>
30
               <a class="uk-navbar-item uk-logo uk-padding-remove-left uk-visible@m" href="../../sushilite/" >
31
                  OpenAIRE SUSHI Lite Client</a>
32
               <a class="uk-navbar-item uk-logo uk-padding-remove-left uk-hidden@m"  href="../../sushilite/">
33
                  SUSHI Lite Client</a>
34
            </div>
35
         </nav>
36
      </div>
37
   </div>
38
   <div class="tm-header uk-visible@m tm-header-transparent" uk-header="">
39
      <!-- top=".tm-header" + [class*=&quot;uk-section&quot;] -->
40
      <div animation="uk-animation-slide-top" class="uk-navbar-container uk-sticky  uk-navbar-transparent uk-light" cls-active="uk-active uk-navbar-sticky" cls-inactive="uk-navbar-transparent uk-light" media="768"  uk-sticky="">
41
         <div class="uk-container uk-container-expand">
42
            <nav class="uk-navbar" uk-navbar="{&quot;align&quot;:&quot;left&quot;}" style="background-color:white !important;">
43
               <div class="uk-navbar-center">
44
                  <div class="uk-logo uk-navbar-item uk-margin-small-top">
45
                     <a class="uk-logo uk-navbar-item uk-link"   href="https://www.openaire.eu">
46
                        <img alt="OpenAIRE" class="uk-responsive-height" src="../../assets/Logo_Horizontal.png">
47
                     </a>
48
                  </div>
49
                  <div class="uk-logo uk-navbar-item uk-margin-medium-top">
50
                     <h3 style="color: #767779 !important;"><a class="uk-navbar-item uk-logo"  href="../../sushilite/">
51
                        SUSHI Lite Client</a>
52
                     </h3>
53
                  </div>
54
               </div>
55
            </nav>
56
         </div>
57
      </div>
58
   </div>
59
   <!-- MENU ENDS HERE-->
60
   <div class="first_page_section uk-section-default uk-section uk-padding-remove-vertical">
61
      <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
62
      </div>
63
   </div>
64
   <div id="tm-main" class=" uk-section  uk-margin-large-top tm-middle custom-main-content">
65
      <div uk-grid="" class="uk-grid uk-grid-stack">
66
         <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column">
67
            <div class="uk-container">
68
               <form action="../../sushilite/GetReport/" method="get" class="uk-forml uk-width-1-1@s uk-width-2-3@m  uk-container ">
69
                  <h3>Report Request</h3>
70
                  <div class="uk-grid">
71
                     <div class=" uk-width-1-3 uk-text-right">
72
                        Report Name:
73
                     </div>
74
                     <div class="uk-width-2-3">
75
                        <select name='Report'>
76
                           <option value='BR2'>BR2</option>
77
                        </select>
78
                     </div>
79
                  </div>
80
                  <div class="uk-grid">
81
                     <div class=" uk-width-1-3 uk-text-right">
82
                        Release:
83
                     </div>
84
                     <div class="uk-width-2-3">
85
                        <select name='Release'>
86
                           <option value="4">4</option>
87
                        </select>
88
                     </div>
89
                  </div>
90
                  <div class="uk-grid">
91
                     <div class=" uk-width-1-3 uk-text-right">
92
                        Requestor:
93
                     </div>
94
                     <div class="uk-width-2-3">
95
                        <input type="text" name="RequestorID" value="anonymous">
96
                     </div>
97
                  </div>
98
                  <h3>Report Filters</h3>
99
                  <h5>Date range</h5>
100
                  <p>Valid date formats are yyyy-mm-dd or yyyy-mm. Default range is the last available month.
101
                  </p>
102
                  <div class="uk-grid">
103
                     <div class=" uk-width-1-3 uk-text-right">
104
                        Begin Date:
105
                     </div>
106
                     <div class="uk-width-2-3">
107
                        <input type="text" name="BeginDate" placeholder="2016-03" />
108
                     </div>
109
                  </div>
110
                  <div class="uk-grid">
111
                     <div class=" uk-width-1-3 uk-text-right">
112
                        End Date:
113
                     </div>
114
                     <div class="uk-width-2-3">
115
                        <input type="text" name="EndDate" placeholder="2016-06" />
116
                     </div>
117
                  </div>
118
                  <h5>Filters</h5>
119
                  <p>Provide either a Repository Identifier or an Item Identifier<br />
120
                     Identifier format: <b>namespace:value</b><br />
121
                     Valid namespace for Repository Identifier: <b>openaire</b> or <b>opendoar</b>.<br />
122
                     Valid namespace for Item Identifier: <b>openaire</b>, <b>doi</b> or <b>oid</b>(for OAI-PMH).
123
                  </p>
124
                  <div class="uk-grid">
125
                     <div class=" uk-width-1-3 uk-text-right">
126
                        Repository Identifier:
127
                     </div>
128
                     <div class="uk-width-2-3">
129
                        <input type="text" name="RepositoryIdentifier" placeholder="e.g. opendoar:1503">
130
                     </div>
131
                  </div>
132
                  <div class="uk-grid">
133
                     <div class=" uk-width-1-3 uk-text-right">
134
                        Item Identifier:
135
                     </div>
136
                     <div class="uk-width-2-3">
137
                        <input type="text" name="ItemIdentifier" placeholder="e.g. openaire:od_________::fb90de6f20d79783d05749d8f60417d5">
138
                     </div>
139
                  </div>
140
                  <!--
141
                     //<p>You may also limit the results to include or exclude items that have a DOI<br />
142
                         //Valid values: Yes or No</p>
143
                     //hasDOI:
144
                     //<select name='hasDOI'>
145
                         //<option value="">Not applicable</option>
146
                         //<option value="Yes">Yes</option>
147
                         //<option value="No">No</option>
148
                         //</select>
149

  
150
                     -->
151
                  <h3>Report Attributes</h3>
152
                  <p>Valid Granularity values: Monthly or Totals</p>
153
                  <div class="uk-grid">
154
                     <div class=" uk-width-1-3 uk-text-right">
155
                        Granularity:
156
                     </div>
157
                     <div class="uk-width-2-3">
158
                        <select name='Granularity'>
159
                           <option value="Monthly">Monthly</option>
160
                           <option value="Totals">Totals</option>
161
                        </select>
162
                     </div>
163
                  </div>
164
                  <!--
165
                     //<p>The format in which the response is to be returned defaults to JSON unless a callback function name is entered in which case JSONP is returned.</p>
166
                     //<input type="text" name="Callback">
167
                     -->
168
                  <p>The Pretty attribute is just for humans playing with the API and looking at results in a browser.</p>
169
                  <p><input type="checkbox" name="Pretty" value="Pretty" checked="checked">Pretty print json(p) for humans</p>
170
                  <input type="submit" class="uk-button uk-button-primary" value="Get Report"/>
171
               </form>
172
            </div>
173
         </div>
174
      </div>
175
   </div>
176
   <!-- FOOTER STARTS HERE-->
177
   <div class="custom-footer" style="">
178
      <div class="uk-section-primary uk-section uk-section-small">
179
         <div class="uk-container">
180
            <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
181
               <div class="uk-width-1-1@m uk-first-column">
182
                  <div class="uk-margin uk-margin-remove-top uk-margin-remove-bottom uk-text-center">
183
                     <img alt="OpenAIRE" class="el-image" src="../../assets/Logo_Horizontal_white_small.png">
184
                  </div>
185
                  <div class="footer-license uk-margin uk-margin-remove-bottom uk-text-center uk-text-lead">
186
                     <div><a href="http://creativecommons.org/licenses/by/4.0/" rel="license" target="_blank"><img alt="Creative" src="../../assets/80x15.png" style="height: auto; max-width: 100%; vertical-align: middle;"></a>&nbsp;UNLESS OTHERWISE INDICATED, ALL MATERIALS CREATED BY THE OPENAIRE CONSORTIUM ARE LICENSED UNDER A&nbsp;<a href="http://creativecommons.org/licenses/by/4.0/" rel="license">CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE</a>.</div>
187
                     <div>OPENAIRE IS POWERED BY&nbsp;<a href="http://www.d-net.research-infrastructures.eu/" target="_blank">D-NET</a>.</div>
188
                  </div>
189
                  <div class="uk-margin uk-margin-remove-top uk-margin-remove-bottom uk-text-right">
190
                     <a class="uk-totop uk-icon" href="#" uk-scroll="" uk-totop=""></a>
191
                  </div>
192
               </div>
193
            </div>
194
         </div>
195
      </div>
196
   </div>
197
</div>
198
</body>
199
</html>
modules/dnet-openaire-usage-stats-api/src/main/resources/static/sushilite/index.html
73 73
                        <li><a href="./IR1/">IR1 Report</a></li>
74 74
                        <li><a href="./RR1/">RR1 Report</a></li>
75 75
                        <li><a href="./JR1/">JR1 Report</a></li>
76
                        <li><a href="./BR1/">BR1 Report</a></li>
77
                        <li><a href="./BR2/">BR2 Report</a></li>
76 78
                    </ul>
77 79
                    <br>
78 80
                </div>
modules/dnet-openaire-usage-stats-api/src/main/resources/static/index.html
73 73
                        <li><a href="./sushilite/IR1/">IR1 Report</a></li>
74 74
                        <li><a href="./sushilite/RR1/">RR1 Report</a></li>
75 75
                        <li><a href="./sushilite/JR1/">JR1 Report</a></li>
76
                        <li><a href="./sushilite/BR1/">BR1 Report</a></li>
77
                        <li><a href="./sushilite/BR2/">BR2 Report</a></li>
76 78
                    </ul>
77 79
                    <br>
78 80
                </div>
modules/dnet-openaire-usage-stats-api/pom.xml
5 5
    <modelVersion>4.0.0</modelVersion>
6 6
    <groupId>eu.dnetlib</groupId>
7 7
    <artifactId>dnet-openaire-usage-stats-api</artifactId>
8
    <version>2.0.1-SNAPSHOT</version>
8
    <version>2.0.2-SNAPSHOT</version>
9 9
    <packaging>war</packaging>
10 10
    <parent>
11 11
        <!--
......
15 15
        -->
16 16
        <groupId>org.springframework.boot</groupId>
17 17
        <artifactId>spring-boot-starter-parent</artifactId>
18
        <version>1.5.4.RELEASE</version>
18
        <version>1.5.9.RELEASE</version>
19 19
    </parent>
20 20

  
21 21
    <dependencies>

Also available in: Unified diff