dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #31346
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15958: tracker capture - relationship WIP
------------------------------------------------------------
revno: 15958
committer: Abyot Asalefew Gizaw abyota@xxxxxxxxx
branch nick: dhis2
timestamp: Thu 2014-07-03 14:40:31 +0200
message:
tracker capture - relationship WIP
modified:
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/add-relationship.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/add-relationship.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/add-relationship.html 2014-07-03 11:30:22 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/add-relationship.html 2014-07-03 12:40:31 +0000
@@ -14,15 +14,11 @@
<div class="row" ng-show="selectedRelationshipType">
<hr>
- <div class="col-md-12">
- <p>{{'a_is_to_b'| translate}} = {{selectedRelationshipType.aIsToB}}</p>
- <p>{{'b_is_to_a'| translate}} = {{selectedRelationshipType.bIsToA}}</p>
- </div>
<div class="row col-md-12">
<div class="col-md-5">
- <h3 class='align-center'>A</h3>
- <div class='bordered-div-compact'>
- <table class="table table-striped table-borderless">
+ <div class='align-center bold'>A ({{selectedRelationshipType.aIsToB}})</div>
+ <div class='relationship-container'>
+ <table class="table table-striped table-compact table-borderless">
<tr ng-repeat="attribute in selectedTei.attributes">
<td>
{{attribute.displayName}}
@@ -35,15 +31,15 @@
</div>
</div>
<div class="col-md-7">
- <h3 class='align-center'>B</h3>
- <div class='bordered-div-compact'>
+ <div class='align-center bold'>B ({{selectedRelationshipType.bIsToA}})</div>
+ <div class='relationship-container'>
<select ng-model="selectedRelationshipSource"
class="form-control"
ng-options="relationshipSource | translate for relationshipSource in relationshipSources">
<option value="">{{'please_select_source'| translate}}</option>
</select>
-
- <div id="searchDropDownParent" class="input-group vertical-spacing" ng-show="selectedRelationshipSource === 'search_from_existing' ">
+
+ <div id="searchDropDownParent" class="input-group vertical-spacing" ng-show="selectedRelationshipSource === 'search_from_existing'">
<input type="text" placeholder="{{'search_from_existing'| translate}}" ng-model="searchText" class="form-control expanded" ng-class="{true: 'invalid - input'} [!searchText && emptySearchText]" ng-focus="showHideSearch()">
<div class="input-group-btn">
<button class="btn btn-default without-border-radius trim" type="button" title="{{'advanced_search'| translate}}" data-toggle="dropdown" ng-click="showHideSearch()"><i class="fa fa-caret-down"></i></button>
@@ -54,14 +50,13 @@
</div>
</div>
</div>
- <div ng-show="selectedRelationshipSource === 'register_new' ">
- <div ng-include="'components/registration/registration.html'"></div>
+ <div ng-show="selectedRelationshipSource === 'register_new'">
+ <div ng-include="'components/registration/registration-and-relationship.html'"></div>
</div>
</div>
</div>
</div>
</div>
-
</div>
<div class="modal-footer">
<button class="btn btn-primary trim" data-ng-click="add()" >{{'add'| translate}}</button>
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2014-07-03 11:30:22 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2014-07-03 12:40:31 +0000
@@ -362,12 +362,6 @@
margin-bottom: 20px;
}
-.bordered-div-compact {
- border: 1px solid #c2c2c2;
- border-radius: 5px;
- padding: 5px;
-}
-
.nav, .pagination, .carousel, .panel-title a {
cursor: pointer;
text-decoration: none;
@@ -524,7 +518,9 @@
.container-1-1 {
width: 100%;
float: left;
+ margin-top: 50px;
height: 100%;
+ min-height: 100%;
}
.container-1-2 {
@@ -585,6 +581,12 @@
margin-top: 5px;
}
+.search-container-main {
+ width: 100%;
+ float: left;
+ height: 100%;
+}
+
.search-container{
margin: 5px;
padding: 5px;
@@ -601,6 +603,15 @@
padding: 20px 10px;
}
+.relationship-container {
+ border: 1px solid #c2c2c2;
+ border-radius: 5px;
+ padding: 5px;
+ min-height: 500px;
+ max-height: 500px;
+ overflow-y: scroll;
+}
+
.trim {
margin-bottom: 5px;
margin-top: 5px;
@@ -975,5 +986,4 @@
.dropdown-menu-right{
right: 0;
left: auto;
-}
-
+}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html 2014-07-03 11:34:18 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html 2014-07-03 12:40:31 +0000
@@ -1,4 +1,4 @@
-<div class="container-1-1">
+<div class="search-container-main">
<div class="search-container">
<table data-stop-propagation="true" class="table-borderless table-striped">
<tr>
