Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
humanities
gargantext
Commits
aee4893c
Commit
aee4893c
authored
Dec 15, 2014
by
Mathieu Rodic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FEATURE] Graph now refreshes automatically
[BUGFIX] Corrected aggregation by decade & century
parent
8a314114
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
gargantext.angular.js
static/js/gargantext.angular.js
+3
-3
mvc.html
templates/tests/mvc.html
+1
-1
No files found.
static/js/gargantext.angular.js
View file @
aee4893c
...
...
@@ -47,11 +47,11 @@ var groupings = {
datetime
:
{
century
:
{
truncate
:
function
(
x
)
{
return
x
.
substr
(
0
,
2
)
+
'00-01-01T00:00:00Z'
;},
next
:
function
(
x
)
{
addZeros
((
parseInt
(
x
.
substr
(
0
,
2
)
+
1
)
%
100
),
2
)
+
x
.
substr
(
2
);},
next
:
function
(
x
)
{
x
=
new
Date
(
x
);
x
.
setFullYear
(
x
.
getFullYear
()
+
100
);
return
strDate
(
x
);},
},
decade
:
{
truncate
:
function
(
x
)
{
return
x
.
substr
(
0
,
3
)
+
'0-01-01T00:00:00Z'
;},
next
:
function
(
x
)
{
addZeros
((
parseInt
(
x
.
substr
(
0
,
3
)
+
1
)
%
1000
),
2
)
+
x
.
substr
(
3
);},
next
:
function
(
x
)
{
x
=
new
Date
(
x
);
x
.
setFullYear
(
x
.
getFullYear
()
+
10
);
return
strDate
(
x
);},
},
year
:
{
truncate
:
function
(
x
)
{
return
x
.
substr
(
0
,
4
)
+
'-01-01T00:00:00Z'
;},
...
...
@@ -408,7 +408,7 @@ gargantext.controller("GraphController", function($scope, $http, $element) {
filters
:
data
.
filters
,
mesured
:
data
.
mesured
};
//
$scope.query();
$scope
.
query
();
});
});
...
...
templates/tests/mvc.html
View file @
aee4893c
...
...
@@ -266,7 +266,7 @@
</div>
<div
class=
"graph-parameters"
>
X-axis: groups the results by
<select
ng-model=
"groupingKey"
ng-options=
"key for key in ['day', 'month', 'year', 'decade', 'century']"
>
<select
ng-model=
"groupingKey"
ng-options=
"key for key in ['day', 'month', 'year', 'decade', 'century']"
ng-change=
"showResults()"
>
</select>
<br/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment