Skip to content

Commit

Permalink
Merge pull request #471 from st2135/refactor
Browse files Browse the repository at this point in the history 
fields issue fix
  • Loading branch information
@st2135
st2135 authored Nov 19, 2016
2 parents 5dbae10 + e8d5e17 commit 6ff61cc
Show file tree
Hide file tree
Showing 11 changed files with 392 additions and 44 deletions.
98 changes: 65 additions & 33 deletions lingvodoc/static/js/webui-fastopt.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15640,32 +15640,26 @@ $c_Lru_ispras_lingvodoc_frontend_app_model_Field$$anonfun$1$$anon$1.prototype.in
});
$c_Lru_ispras_lingvodoc_frontend_app_model_Field$$anonfun$1$$anon$1.prototype.apply__sc_Seq__Lru_ispras_lingvodoc_frontend_app_model_Field = (function(js) {
var this$1 = new $c_Lupickle_Js$Obj().init___sc_Seq(js);
var this$2 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$1).apply__O__O("client_id"));
var clientId = $doubleToInt($s_Lupickle_Js$Value$class__num__Lupickle_Js$Value__D(this$2));
var this$2 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$1).apply__O__O("translation"));
var translation = $s_Lupickle_Js$Value$class__str__Lupickle_Js$Value__T(this$2);
var this$3 = new $c_Lupickle_Js$Obj().init___sc_Seq(js);
var this$4 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$3).apply__O__O("object_id"));
var objectId = $doubleToInt($s_Lupickle_Js$Value$class__num__Lupickle_Js$Value__D(this$4));
var this$4 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$3).apply__O__O("translation_gist_client_id"));
var translationGistClientId = $doubleToInt($s_Lupickle_Js$Value$class__num__Lupickle_Js$Value__D(this$4));
var this$5 = new $c_Lupickle_Js$Obj().init___sc_Seq(js);
var this$6 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$5).apply__O__O("translation"));
var translation = $s_Lupickle_Js$Value$class__str__Lupickle_Js$Value__T(this$6);
var this$6 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$5).apply__O__O("translation_gist_object_id"));
var translationGistObjectId = $doubleToInt($s_Lupickle_Js$Value$class__num__Lupickle_Js$Value__D(this$6));
var this$7 = new $c_Lupickle_Js$Obj().init___sc_Seq(js);
var this$8 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$7).apply__O__O("translation_gist_client_id"));
var translationGistClientId = $doubleToInt($s_Lupickle_Js$Value$class__num__Lupickle_Js$Value__D(this$8));
var this$8 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$7).apply__O__O("data_type_translation_gist_client_id"));
var dataTypeTranslationGistClientId = $doubleToInt($s_Lupickle_Js$Value$class__num__Lupickle_Js$Value__D(this$8));
var this$9 = new $c_Lupickle_Js$Obj().init___sc_Seq(js);
var this$10 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$9).apply__O__O("translation_gist_object_id"));
var translationGistObjectId = $doubleToInt($s_Lupickle_Js$Value$class__num__Lupickle_Js$Value__D(this$10));
var this$10 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$9).apply__O__O("data_type_translation_gist_object_id"));
var dataTypeTranslationGistObjectId = $doubleToInt($s_Lupickle_Js$Value$class__num__Lupickle_Js$Value__D(this$10));
var jsx$1 = $g.Date;
var this$11 = new $c_Lupickle_Js$Obj().init___sc_Seq(js);
var this$12 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$11).apply__O__O("data_type_translation_gist_client_id"));
var dataTypeTranslationGistClientId = $doubleToInt($s_Lupickle_Js$Value$class__num__Lupickle_Js$Value__D(this$12));
var this$12 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$11).apply__O__O("created_at"));
var createdAt = new jsx$1($s_Lupickle_Js$Value$class__num__Lupickle_Js$Value__D(this$12));
var this$13 = new $c_Lupickle_Js$Obj().init___sc_Seq(js);
var this$14 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$13).apply__O__O("data_type_translation_gist_object_id"));
var dataTypeTranslationGistObjectId = $doubleToInt($s_Lupickle_Js$Value$class__num__Lupickle_Js$Value__D(this$14));
var jsx$1 = $g.Date;
var this$15 = new $c_Lupickle_Js$Obj().init___sc_Seq(js);
var this$16 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$15).apply__O__O("created_at"));
var createdAt = new jsx$1($s_Lupickle_Js$Value$class__num__Lupickle_Js$Value__D(this$16));
var this$17 = new $c_Lupickle_Js$Obj().init___sc_Seq(js);
var x1 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$17).apply__O__O("is_translatable"));
var x1 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$13).apply__O__O("is_translatable"));
var x = $m_Lupickle_Js$True$();
var isTranslatable = (x === x1);
var x1$2 = js.find__F1__s_Option(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function(x$1$2) {
Expand All @@ -15676,28 +15670,66 @@ $c_Lru_ispras_lingvodoc_frontend_app_model_Field$$anonfun$1$$anon$1.prototype.ap
if ($is_s_Some(x1$2)) {
var x2 = $as_s_Some(x1$2);
var l = $as_T2(x2.x$2);
var this$20 = $m_Lupickle_default$();
var this$16 = $m_Lupickle_default$();
var expr = $as_Lupickle_Js$Value(l.$$und2__O());
var this$19 = $m_Lupickle_default$().Internal__Lupickle_Implicits$Internal$();
var this$15 = $m_Lupickle_default$().Internal__Lupickle_Implicits$Internal$();
var r = new $c_sjsr_AnonFunction0().init___sjs_js_Function0((function() {
var e = $m_Lru_ispras_lingvodoc_frontend_app_model_Link$().reader$1;
return e
}));
var evidence$4 = new $c_Lupickle_Implicits$Internal$$anon$2().init___Lupickle_Implicits$Internal$__T__F0(this$19, "Tagged Object ru.ispras.lingvodoc.frontend.app.model.Link", r);
var link = new $c_s_Some().init___O($s_Lupickle_Types$class__readJs__Lupickle_Types__Lupickle_Js$Value__Lupickle_Types$Reader__O(this$20, expr, evidence$4))
var evidence$4 = new $c_Lupickle_Implicits$Internal$$anon$2().init___Lupickle_Implicits$Internal$__T__F0(this$15, "Tagged Object ru.ispras.lingvodoc.frontend.app.model.Link", r);
var link = new $c_s_Some().init___O($s_Lupickle_Types$class__readJs__Lupickle_Types__Lupickle_Js$Value__Lupickle_Types$Reader__O(this$16, expr, evidence$4))
} else {
var x$5 = $m_s_None$();
if ((!(x$5 === x1$2))) {
throw new $c_s_MatchError().init___O(x1$2)
};
var link = $m_s_None$()
};
var this$21 = js.find__F1__s_Option(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function(x$2$2) {
var x1$3 = js.find__F1__s_Option(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function(x$2$2) {
var x$2$1 = $as_T2(x$2$2);
var x$4 = x$2$1.$$und1__O();
return ((x$4 !== null) && $objectEquals(x$4, "contains"))
return ((x$4 !== null) && $objectEquals(x$4, "field_client_id"))
})));
var ev$1 = $as_T2((this$21.isEmpty__Z() ? new $c_T2().init___O__O("contains", new $c_Lupickle_Js$Arr().init___sc_Seq($m_sci_Nil$())) : this$21.get__O())).$$und2__O();
if ($is_s_Some(x1$3)) {
var x2$2 = $as_s_Some(x1$3);
var p = $as_T2(x2$2.x$2);
var this$17 = $as_Lupickle_Js$Value(p.$$und2__O());
var clientId = $doubleToInt($s_Lupickle_Js$Value$class__num__Lupickle_Js$Value__D(this$17))
} else {
var x$7 = $m_s_None$();
if ((!(x$7 === x1$3))) {
throw new $c_s_MatchError().init___O(x1$3)
};
var this$18 = new $c_Lupickle_Js$Obj().init___sc_Seq(js);
var this$19 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$18).apply__O__O("client_id"));
var clientId = $doubleToInt($s_Lupickle_Js$Value$class__num__Lupickle_Js$Value__D(this$19))
};
var x1$4 = js.find__F1__s_Option(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function(x$3$2) {
var x$3$1 = $as_T2(x$3$2);
var x$6 = x$3$1.$$und1__O();
return ((x$6 !== null) && $objectEquals(x$6, "field_object_id"))
})));
if ($is_s_Some(x1$4)) {
var x2$3 = $as_s_Some(x1$4);
var p$2 = $as_T2(x2$3.x$2);
var this$20 = $as_Lupickle_Js$Value(p$2.$$und2__O());
var objectId = $doubleToInt($s_Lupickle_Js$Value$class__num__Lupickle_Js$Value__D(this$20))
} else {
var x$9 = $m_s_None$();
if ((!(x$9 === x1$4))) {
throw new $c_s_MatchError().init___O(x1$4)
};
var this$21 = new $c_Lupickle_Js$Obj().init___sc_Seq(js);
var this$22 = $as_Lupickle_Js$Value($s_Lupickle_Js$Value$class__obj__Lupickle_Js$Value__sci_Map(this$21).apply__O__O("object_id"));
var objectId = $doubleToInt($s_Lupickle_Js$Value$class__num__Lupickle_Js$Value__D(this$22))
};
var this$23 = js.find__F1__s_Option(new $c_sjsr_AnonFunction1().init___sjs_js_Function1((function(x$4$2) {
var x$4$1 = $as_T2(x$4$2);
var x$8 = x$4$1.$$und1__O();
return ((x$8 !== null) && $objectEquals(x$8, "contains"))
})));
var ev$1 = $as_T2((this$23.isEmpty__Z() ? new $c_T2().init___O__O("contains", new $c_Lupickle_Js$Arr().init___sc_Seq($m_sci_Nil$())) : this$23.get__O())).$$und2__O();
var fields = ((ev$1 === null) ? null : $as_Lupickle_Js$Arr(ev$1).value$1);
var elem = $as_sc_Seq($m_sc_Seq$().apply__sc_Seq__sc_GenTraversable($m_sci_Nil$()));
var subFields = new $c_sr_ObjectRef().init___O(elem);
Expand All @@ -15708,17 +15740,17 @@ $c_Lru_ispras_lingvodoc_frontend_app_model_Field$$anonfun$1$$anon$1.prototype.ap
var x2$1 = ((e$1 === null) ? null : $as_Lupickle_Js$Obj(e$1).value$1);
var jsx$3 = $as_sc_Seq(subFields$1.elem$1);
var jsx$2 = arg$outer.apply__sc_Seq__Lru_ispras_lingvodoc_frontend_app_model_Field(x2$1);
var this$23 = $m_sc_Seq$();
subFields$1.elem$1 = $as_sc_Seq(jsx$3.$$colon$plus__O__scg_CanBuildFrom__O(jsx$2, this$23.ReusableCBFInstance$2))
var this$25 = $m_sc_Seq$();
subFields$1.elem$1 = $as_sc_Seq(jsx$3.$$colon$plus__O__scg_CanBuildFrom__O(jsx$2, this$25.ReusableCBFInstance$2))
}
})
})(this, subFields)));
var field = new $c_Lru_ispras_lingvodoc_frontend_app_model_Field().init___I__I__T__I__I__I__I__Z__sjs_js_Date(clientId, objectId, translation, translationGistClientId, translationGistObjectId, dataTypeTranslationGistClientId, dataTypeTranslationGistObjectId, isTranslatable, createdAt);
var col = $as_sc_Seq(subFields.elem$1);
var this$26 = $m_sjsr_package$();
var this$28 = $m_sjsr_package$();
if ($is_sjs_js_ArrayOps(col)) {
var x2$2 = $as_sjs_js_ArrayOps(col);
var jsx$4 = x2$2.scala$scalajs$js$ArrayOps$$array$f
var x2$4 = $as_sjs_js_ArrayOps(col);
var jsx$4 = x2$4.scala$scalajs$js$ArrayOps$$array$f
} else if ($is_sjs_js_WrappedArray(col)) {
var x3 = $as_sjs_js_WrappedArray(col);
var jsx$4 = x3.array$6
Expand All @@ -15728,7 +15760,7 @@ $c_Lru_ispras_lingvodoc_frontend_app_model_Field$$anonfun$1$$anon$1.prototype.ap
return (function(x$2$3) {
return $uI(result$1.push(x$2$3))
})
})(this$26, result)));
})(this$28, result)));
var jsx$4 = result
};
field.fields$2 = jsx$4;
Expand Down
6 changes: 3 additions & 3 deletions lingvodoc/static/js/webui-fastopt.js.map
View file

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions lingvodoc/static/templates/include/availableLanguage.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<h4>{{ language.translation }}</h4>

<ul>
<li ng-repeat="dictionary in language.dictionaries">
<input type="checkbox" ng-checked="controller.isDictionarySelected(dictionary)" ng-click="controller.toggleDictionarySelection(dictionary)"> {{ dictionary.translation }}
<!--<ul>-->
<!--<li ng-repeat="perspective in dictionary.perspectives" ng-init="authors=controller.getPerspectiveAuthors(perspective)">-->
<!--<span>-->
<!--<a ng-href="#/dictionary/{{dictionary.clientId}}/{{dictionary.objectId}}/perspective/{{perspective.clientId}}/{{perspective.objectId}}/view">{{perspective.translation}} <small ng-if="authors">({{ authors }})</small></a>-->
<!--</span>-->
<!--</li>-->
<!--</ul>-->

</li>
</ul>

<ul ng-if="language.languages.length > 0">
<li ng-repeat="language in language.languages" ng-include="'/static/templates/include/availableLanguage.html'"></li>
</ul>
1 change: 0 additions & 1 deletion webui/deploy.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ cp shared/src/templates/*.html ../lingvodoc/static/templates/
cp -r shared/src/templates/modal/ ../lingvodoc/static/templates/
cp -r shared/src/templates/include/ ../lingvodoc/static/templates/


cp shared/src/css/*.css ../lingvodoc/static/css/
cp shared/src/images/* ../lingvodoc/static/images/
136 changes: 136 additions & 0 deletions webui/desktop/src/templates/dashboard.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
<div class="container" ng-cloak>


<div class="panel">
<button type="button" class="btn btn-primary" ng-click="controller.loadMyDictionaries()">
<translatable str="My dictionaries">My dictionaries</translatable>
</button>
<button type="button" class="btn btn-primary" ng-click="controller.loadAvailableDictionaries()">
<translatable str="Available dictionaries">Available dictionaries</translatable>
</button>
</div>
<br>



<div id="loader-wrapper" ng-show="!status">
<div id="loader"></div>
</div>



<div ng-if="dictionaries.length > 0" ng-show="status">
<div ng-repeat="dictionary in dictionaries">
<div>
<div class="btn-group col-md-8 col-sm-8 col-lg-8 col-xs-8">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<button type="button" class="btn btn-default dropdown-toggle col-md-10 col-lg-11 col-sm-10 col-xs-9"
data-toggle="dropdown">{{ dictionary.translation }}
</button>
<ul class="dropdown-menu">
<li><a href="" ng-click="controller.editDictionaryProperties(dictionary)">
<translatable str="Edit information">Properties</translatable>
</a></li>
<li><a href="" ng-click="controller.editDictionaryRoles(dictionary)">
<translatable str="Edit roles">Edit roles</translatable>
</a></li>
<li><a href="" ng-click="controller.removeDictionary(dictionary)">
<translatable str="Remove dictionary">Remove dictionary</translatable>
</a></li>
<li role="separator" class="divider"></li>
<li><a href="" ng-click="controller.createPerspective(dictionary)">
<translatable str="Create new perspective">Create a new perspective</translatable>
</a></li>
</ul>
</div>
<div class="btn-group col-md-4 col-sm-4 col-lg-4">
<button type="button" class="btn btn-info col-md-10 col-lg-11 col-sm-10 col-xs-8"
data-toggle="dropdown">{{ controller.getDictionaryStatus(dictionary).content }}
</button>
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu">
<li ng-repeat="status in controller.getStatuses()"><a href=""
ng-click="controller.setDictionaryStatus(dictionary, status)">{{status.content}}</a>
</li>
</ul>
</div>

</div>

<br><br>

<div>
<div ng-repeat="perspective in dictionary.perspectives">
<div class="btn-group btn-group-xs col-lg-offset-1 col-md-offset-1 col-sm-offset-1 col-xs-offset-1 col-md-7 col-sm-7 col-lg-7 col-xs-7">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<button type="button"
class="btn btn-default col-md-10 col-lg-11 col-sm-10 col-xs-9 dropdown-toggle"
data-toggle="dropdown">{{ perspective.translation }}
</button>
<ul class="dropdown-menu">
<li><a href=""
ng-attr-href="{{ controller.getActionLink(dictionary, perspective, 'view') }}">
<translatable str="View published">View published</translatable>
</a></li>
<li><a href=""
ng-attr-href="{{ controller.getActionLink(dictionary, perspective, 'edit') }}">
<translatable str="Edit">Edit</translatable>
</a></li>
<li role="separator" class="divider"></li>
<li><a href="" ng-click="controller.editPerspectiveRoles(dictionary, perspective)">
<translatable str="Edit roles">Roles</translatable>
</a></li>
<li><a href="" ng-click="controller.editPerspectiveProperties(dictionary, perspective)">
<translatable str="Edit properties">Properties</translatable>
</a></li>
<li><a href="" ng-click="controller.removePerspective(dictionary, perspective)">
<translatable str="Remove perspective">Remove perspective</translatable>
</a></li>

</ul>
</div>
<div class="btn-group btn-group-xs col-md-4 col-sm-4 col-lg-4 col-xs-4 ">
<button type="button"
class="btn btn-info dropdown-toggle col-md-10 col-lg-11 col-sm-10 col-xs-8"
data-toggle="dropdown">{{ controller.getPerspectiveStatus(perspective).content }}
</button>
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu">
<li ng-repeat="status in controller.getStatuses()"><a href=""
ng-click="controller.setPerspectiveStatus(perspective, status)">{{status.content}}</a>
</li>
</ul>
</div>
<br><br>
</div>
</div>
<hr>
</div>
</div>

<div ng-if="dictionaries.length == 0" ng-show="status">
<span>No dictionaries</span>
</div>

<hr>

<a href="#/dictionary/create" class="btn btn-primary">
<translatable str="Create dictionary...">Create dictionary...</translatable>
</a>
</div>
Loading

0 comments on commit 6ff61cc

Please sign in to comment.