diff --git a/site/public/javascript/services/project.js b/site/public/javascript/services/project.js index fb818a8..1210cc0 100644 --- a/site/public/javascript/services/project.js +++ b/site/public/javascript/services/project.js @@ -16,6 +16,14 @@ application.factory( _version.date_formated = _version.moment_date.format( 'LTS' ); _version.time_from_now = _version.moment_date.fromNow(); + // Project last update date + if( _version.moment_date.isAfter( result.last_update_moment_date ) ) + { + result.last_update_moment_date = _version.moment_date; + result.last_update_date_formated = _version.date_formated; + result.last_update_time_from_now = _version.time_from_now; + } + // Lines _version.lines = []; var length = _version.content.split(/\r\n|\r|\n/).length; @@ -111,7 +119,9 @@ application.factory( var result = {}; result.name = ''; result.files = {}; + result.files_count = 0; result.tree = new FileTree( { auto_wash: false } ); + result.date_formated = ''; result.on_update = null; result.on_new_version = null; @@ -140,6 +150,8 @@ application.factory( result.files[ data.path.full ] = file; result.tree.add_file( data.path.full, file ) + + result.files_count++; } // Apply callback @@ -176,6 +188,8 @@ application.factory( { result.tree.remove_file( file.path.full ) + result.files_count--; + delete result.files[ data.path.full ] // Apply callback @@ -187,7 +201,18 @@ application.factory( // Update project event socket.on( 'update_project', function( data ) { - result.name = data.name; + result.name = data.name; + result.files_count = data.files.count; + + // Date + result.moment_date = moment( data.date ); + result.date_formated = result.moment_date.format( 'LTS' ); + result.time_from_now = result.moment_date.fromNow(); + + // Last update date + result.last_update_moment_date = moment( data.last_update_date ); + result.last_update_date_formated = result.last_update_moment_date.format( 'LTS' ); + result.last_update_time_from_now = result.last_update_moment_date.fromNow(); // Duplicate files for( var _file_key in data.files.items ) diff --git a/site/public/javascript/services/projects.js b/site/public/javascript/services/projects.js index 61130cf..1dde972 100644 --- a/site/public/javascript/services/projects.js +++ b/site/public/javascript/services/projects.js @@ -13,9 +13,9 @@ application.factory( _project.time_from_now = _project.moment_date.fromNow(); // Last update date - _project.moment_date = moment( _project.last_update_date ); - _project.last_update_date_formated = _project.moment_date.format( 'LTS' ); - _project.last_update_time_from_now = _project.moment_date.fromNow(); + _project.last_update_moment_date = moment( _project.last_update_date ); + _project.last_update_date_formated = _project.last_update_moment_date.format( 'LTS' ); + _project.last_update_time_from_now = _project.last_update_moment_date.fromNow(); return _project; } @@ -32,6 +32,8 @@ application.factory( { result.data = data; + console.log(data); + for( var _project_key in result.data.all ) { var project = result.data.all[ _project_key ]; diff --git a/site/views/pages/index/project.jade b/site/views/pages/index/project.jade index cbf3d67..98c46d3 100644 --- a/site/views/pages/index/project.jade +++ b/site/views/pages/index/project.jade @@ -41,17 +41,17 @@ div(ng-controller="ProjectController as controller",ng-init="init('" + project_s .label | created at .value - | 11:20:13 PM + | {{project.date_formated}} .detail .label | last update .value - | 11:20:13 PM + | {{project.last_update_date_formated}} .detail .label | files .value - | 32 + | {{project.files_count}} .aside-tree nav.files-tree-nav