Skip to content

Commit

Permalink
some more feature
Browse files Browse the repository at this point in the history
  • Loading branch information
lilworks committed Nov 13, 2016
1 parent 993db04 commit fc9c2c7
Show file tree
Hide file tree
Showing 49 changed files with 1,396 additions and 2,861 deletions.
403 changes: 239 additions & 164 deletions .idea/workspace.xml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pro.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ php bin/console generate:doctrine:entities AppBundle
php bin/console doctrine:schema:update --force
php bin/console assets:install --symlink
php bin/console assetic:dump
php bin/console cache:clear


12 changes: 6 additions & 6 deletions src/AppBundle/Entity/BoringMachine.php~
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ class BoringMachine
private $breakdown;

/**
* @var json_array
* @var text
*
* @ORM\Column(name="breakdownBefore", type="json_array", nullable=true)
* @ORM\Column(name="breakdownBefore", type="text", nullable=true)
*/
private $breakdownBefore;
/**
* @var json_array
* @var text
*
* @ORM\Column(name="breakdownAfter", type="json_array" , nullable=true)
* @ORM\Column(name="breakdownAfter", type="text" , nullable=true)
*/
private $breakdownAfter;
/**
Expand Down Expand Up @@ -177,7 +177,7 @@ class BoringMachine
*
* @return BoringMachine
*/
public function setBreakdownBefore(\json $breakdownBefore)
public function setBreakdownBefore($breakdownBefore)
{
$this->breakdownBefore = $breakdownBefore;

Expand All @@ -201,7 +201,7 @@ class BoringMachine
*
* @return BoringMachine
*/
public function setBreakdownAfter(\json $breakdownAfter)
public function setBreakdownAfter( $breakdownAfter)
{
$this->breakdownAfter = $breakdownAfter;

Expand Down
1 change: 1 addition & 0 deletions src/OperatorBundle/Resources/config/routing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ operator_breakdown_delete:
operator_ajax_breakdown_show:
path: /operator/ajax/breakdown/show/{id}
defaults: { _controller: OperatorBundle:Ajax:breakdownShow }

operator_ajax_breakdown_timeline:
path: /operator/ajax/breakdown/timeline
defaults: { _controller: OperatorBundle:Ajax:timeline }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</script>
<div class="row">
<div class="col-lg-12">
<h1>Update matchinbreakdown #{{ breakdown.id }}</h1>
<h1>Update breakdown #{{ breakdown.id }}</h1>
</div>
</div>
<div class="row">
Expand Down
15 changes: 14 additions & 1 deletion src/OperatorBundle/Resources/views/breakdown/timeline.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,22 @@
var items = new vis.DataSet(getTimelineData());
console.log(items);
// Configuration for the Timeline
var options = {};
var options = {
};
// Create a Timeline
var timeline = new vis.Timeline(container, items, options);
function onSelect (properties) {
if(properties.items > 0){
var route = "{{ path('operator_breakdown_edit',{id:'myId'}) }}";
window.location.replace(route.replace("myId",properties.items ));
}
}
timeline.on('select', onSelect);
</script>
{% endblock %}
2 changes: 1 addition & 1 deletion src/SiteBundle/Resources/public/css/landing-page.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ html,body {
}

h1 {
font-size:60px;
font-size:30px;
color:#111155;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045661;
i:1479057971;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045661;
i:1479057971;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045661;
i:1479057971;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045661;
i:1479057971;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0
i:1479045660;
i:1479057968;
8 changes: 4 additions & 4 deletions var/cache/dev/appDevDebugProjectContainer.php
Original file line number Diff line number Diff line change
Expand Up @@ -3084,7 +3084,7 @@ protected function getSecurity_Firewall_Map_Context_MainService()

$q = new \Symfony\Component\Security\Http\Firewall\UsernamePasswordFormAuthenticationListener($b, $f, $g, $m, 'main', $o, $p, array('check_path' => '/login_check', 'use_forward' => false, 'require_previous_session' => true, 'username_parameter' => '_username', 'password_parameter' => '_password', 'csrf_parameter' => '_csrf_token', 'csrf_token_id' => 'authenticate', 'post_only' => true), $a, $c, NULL);

return $this->services['security.firewall.map.context.main'] = new \Symfony\Bundle\SecurityBundle\Security\FirewallContext(array(0 => new \Symfony\Component\Security\Http\Firewall\ChannelListener($l, new \Symfony\Component\Security\Http\EntryPoint\RetryAuthenticationEntryPoint(80, 443), $a), 1 => new \Symfony\Component\Security\Http\Firewall\ContextListener($b, array(0 => $this->get('security.user.provider.concrete.chain_provider'), 1 => $this->get('fr3d_ldap.security.user.provider'), 2 => $this->get('fos_user.user_manager')), 'main', $a, $c), 2 => $n, 3 => $q, 4 => $q, 5 => new \Symfony\Component\Security\Http\Firewall\AnonymousAuthenticationListener($b, '5828728258e303.79578662', $a, $f), 6 => new \Symfony\Component\Security\Http\Firewall\AccessListener($b, $this->get('security.access.decision_manager'), $l, $f)), new \Symfony\Component\Security\Http\Firewall\ExceptionListener($b, $this->get('security.authentication.trust_resolver'), $m, 'main', new \Symfony\Component\Security\Http\EntryPoint\FormAuthenticationEntryPoint($e, $m, '/login', false), NULL, NULL, $a, false));
return $this->services['security.firewall.map.context.main'] = new \Symfony\Bundle\SecurityBundle\Security\FirewallContext(array(0 => new \Symfony\Component\Security\Http\Firewall\ChannelListener($l, new \Symfony\Component\Security\Http\EntryPoint\RetryAuthenticationEntryPoint(80, 443), $a), 1 => new \Symfony\Component\Security\Http\Firewall\ContextListener($b, array(0 => $this->get('security.user.provider.concrete.chain_provider'), 1 => $this->get('fr3d_ldap.security.user.provider'), 2 => $this->get('fos_user.user_manager')), 'main', $a, $c), 2 => $n, 3 => $q, 4 => $q, 5 => new \Symfony\Component\Security\Http\Firewall\AnonymousAuthenticationListener($b, '5828a22e3d3955.77442530', $a, $f), 6 => new \Symfony\Component\Security\Http\Firewall\AccessListener($b, $this->get('security.access.decision_manager'), $l, $f)), new \Symfony\Component\Security\Http\Firewall\ExceptionListener($b, $this->get('security.authentication.trust_resolver'), $m, 'main', new \Symfony\Component\Security\Http\EntryPoint\FormAuthenticationEntryPoint($e, $m, '/login', false), NULL, NULL, $a, false));
}

/**
Expand Down Expand Up @@ -4471,7 +4471,7 @@ protected function getSecurity_Access_DecisionManagerService()
*/
protected function getSecurity_Authentication_ManagerService()
{
$this->services['security.authentication.manager'] = $instance = new \Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager(array(0 => $this->get('fr3d_ldap.security.authentication.provider.main'), 1 => new \Symfony\Component\Security\Core\Authentication\Provider\DaoAuthenticationProvider($this->get('security.user.provider.concrete.chain_provider'), $this->get('security.user_checker.main'), 'main', $this->get('security.encoder_factory'), true), 2 => new \Symfony\Component\Security\Core\Authentication\Provider\AnonymousAuthenticationProvider('5828728258e303.79578662')), false);
$this->services['security.authentication.manager'] = $instance = new \Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager(array(0 => $this->get('fr3d_ldap.security.authentication.provider.main'), 1 => new \Symfony\Component\Security\Core\Authentication\Provider\DaoAuthenticationProvider($this->get('security.user.provider.concrete.chain_provider'), $this->get('security.user_checker.main'), 'main', $this->get('security.encoder_factory'), true), 2 => new \Symfony\Component\Security\Core\Authentication\Provider\AnonymousAuthenticationProvider('5828a22e3d3955.77442530')), false);

$instance->setEventDispatcher($this->get('debug.event_dispatcher'));

Expand Down Expand Up @@ -5115,8 +5115,8 @@ protected function getDefaultParameters()

),
'assetic.java.bin' => '/usr/bin/java',
'assetic.node.bin' => '/usr/bin/node',
'assetic.ruby.bin' => '/usr/bin/ruby',
'assetic.node.bin' => '/usr/local/bin/node',
'assetic.ruby.bin' => '/Users/lil-works1/.rvm/rubies/ruby-2.2.0/bin/ruby',
'assetic.sass.bin' => '/usr/bin/sass',
'assetic.reactjsx.bin' => '/usr/bin/jsx',
'assetic.filter.cssrewrite.class' => 'Assetic\\Filter\\CssRewriteFilter',
Expand Down
2 changes: 1 addition & 1 deletion var/cache/dev/appDevDebugProjectContainer.php.meta

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions var/cache/dev/appDevDebugProjectContainer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -434,8 +434,8 @@
<parameter key="assetic.write_to">/Users/lil-works1/Webdisk/www/symfony-master/NoemaParetoManager/app/../web</parameter>
<parameter key="assetic.variables" type="collection"/>
<parameter key="assetic.java.bin">/usr/bin/java</parameter>
<parameter key="assetic.node.bin">/usr/bin/node</parameter>
<parameter key="assetic.ruby.bin">/usr/bin/ruby</parameter>
<parameter key="assetic.node.bin">/usr/local/bin/node</parameter>
<parameter key="assetic.ruby.bin">/Users/lil-works1/.rvm/rubies/ruby-2.2.0/bin/ruby</parameter>
<parameter key="assetic.sass.bin">/usr/bin/sass</parameter>
<parameter key="assetic.reactjsx.bin">/usr/bin/jsx</parameter>
<parameter key="assetic.filter.cssrewrite.class">Assetic\Filter\CssRewriteFilter</parameter>
Expand Down Expand Up @@ -2208,7 +2208,7 @@
</argument>
<argument type="service">
<service class="Symfony\Component\Security\Core\Authentication\Provider\AnonymousAuthenticationProvider" public="false">
<argument>5828728258e303.79578662</argument>
<argument>5828a22e3d3955.77442530</argument>
</service>
</argument>
</argument>
Expand Down Expand Up @@ -2584,7 +2584,7 @@
<argument type="service">
<service class="Symfony\Component\Security\Http\Firewall\AnonymousAuthenticationListener" public="false">
<argument type="service" id="security.token_storage"/>
<argument>5828728258e303.79578662</argument>
<argument>5828a22e3d3955.77442530</argument>
<argument type="service" id="monolog.logger.security" on-invalid="null"/>
<argument type="service" id="security.authentication.manager"/>
</service>
Expand Down
Loading

0 comments on commit fc9c2c7

Please sign in to comment.