Commit ebe77ce4430ee17a7c7c09ea86a4d1dc7316796d
1 parent
0afabe4e
Exists in
master
and in
2 other branches
Clean up.
Showing
2 changed files
with
4 additions
and
2 deletions
Show diff stats
web/static/js/swapp.js
| @@ -50,6 +50,7 @@ | @@ -50,6 +50,7 @@ | ||
| 50 | this.stopped_at = moment().add(7, 'days').hours(0).minutes(0).seconds(0); | 50 | this.stopped_at = moment().add(7, 'days').hours(0).minutes(0).seconds(0); |
| 51 | started_at = this.started_at.format("YYYY-MM-DDTHH:mm:ss"); | 51 | started_at = this.started_at.format("YYYY-MM-DDTHH:mm:ss"); |
| 52 | stopped_at = this.stopped_at.format("YYYY-MM-DDTHH:mm:ss"); | 52 | stopped_at = this.stopped_at.format("YYYY-MM-DDTHH:mm:ss"); |
| 53 | + console.info("Setting time interval from " + started_at + " to " + stopped_at + "…"); | ||
| 53 | active_targets.forEach(function(target){ | 54 | active_targets.forEach(function(target){ |
| 54 | console.info("Loading CSV data of " + target.name + "…"); | 55 | console.info("Loading CSV data of " + target.name + "…"); |
| 55 | return this$.loadData(target.slug, started_at, stopped_at).then(function(data){ | 56 | return this$.loadData(target.slug, started_at, stopped_at).then(function(data){ |
| @@ -527,7 +528,7 @@ | @@ -527,7 +528,7 @@ | ||
| 527 | Orbits.prototype.orbitersElements = {}; | 528 | Orbits.prototype.orbitersElements = {}; |
| 528 | Orbits.prototype.initOrbiter = function(slug, config, data){ | 529 | Orbits.prototype.initOrbiter = function(slug, config, data){ |
| 529 | var orbit_ellipse, orbiter, orbit_line, orbit_section, this$ = this; | 530 | var orbit_ellipse, orbiter, orbit_line, orbit_section, this$ = this; |
| 530 | - console.info("Initializing target " + slug + "'s orbit…"); | 531 | + console.info("Initializing orbit of " + config.name + "…"); |
| 531 | if (slug in this.orbitersElements) { | 532 | if (slug in this.orbitersElements) { |
| 532 | throw new Error("Second init of " + slug); | 533 | throw new Error("Second init of " + slug); |
| 533 | } | 534 | } |
web/static/js/swapp.ls
| @@ -70,6 +70,7 @@ https://gitlab.irap.omp.eu/CDPP/SPACEWEATHERONLINE | @@ -70,6 +70,7 @@ https://gitlab.irap.omp.eu/CDPP/SPACEWEATHERONLINE | ||
| 70 | @stopped_at = moment().add(7, 'days').hours(0).minutes(0).seconds(0) | 70 | @stopped_at = moment().add(7, 'days').hours(0).minutes(0).seconds(0) |
| 71 | started_at = @started_at.format("YYYY-MM-DDTHH:mm:ss") | 71 | started_at = @started_at.format("YYYY-MM-DDTHH:mm:ss") |
| 72 | stopped_at = @stopped_at.format("YYYY-MM-DDTHH:mm:ss") | 72 | stopped_at = @stopped_at.format("YYYY-MM-DDTHH:mm:ss") |
| 73 | + console.info "Setting time interval from #{started_at} to #{stopped_at}…" | ||
| 73 | active_targets.forEach((target) ~> | 74 | active_targets.forEach((target) ~> |
| 74 | console.info "Loading CSV data of #{target.name}…" | 75 | console.info "Loading CSV data of #{target.name}…" |
| 75 | @loadData(target.slug, started_at, stopped_at).then( | 76 | @loadData(target.slug, started_at, stopped_at).then( |
| @@ -549,7 +550,7 @@ export class Orbits | @@ -549,7 +550,7 @@ export class Orbits | ||
| 549 | 550 | ||
| 550 | orbitersElements: {} | 551 | orbitersElements: {} |
| 551 | initOrbiter: (slug, config, data) -> | 552 | initOrbiter: (slug, config, data) -> |
| 552 | - console.info "Initializing target #{slug}'s orbit…" | 553 | + console.info "Initializing orbit of #{config.name}…" |
| 553 | if slug of @orbitersElements then throw new Error("Second init of #{slug}") | 554 | if slug of @orbitersElements then throw new Error("Second init of #{slug}") |
| 554 | 555 | ||
| 555 | @extremum = Math.max(@extremum, 1.11 * d3.max(data, (d) -> | 556 | @extremum = Math.max(@extremum, 1.11 * d3.max(data, (d) -> |