ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

Browse Source 
# Conflicts:
#	BeWoPlanerMobil/Views/Shared/_Layout.cshtml
This commit is contained in:
Christian
2018-06-29 16:40:02 +02:00
parent cc642e9838 bccd38ec2c
commit c1709a002b
6 changed files with 104 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
BeWoPlanerMobil/Content/BeWoMobileStyle.css
View File

@@ -229,7 +229,7 @@ span {
background-repeat: no-repeat;
background-position: center;
background-size: contain;
padding:7.5px 15px;
padding:7.5px 15px;
}
.floating-element-container {
@@ -253,7 +253,7 @@ input[disabled], button[disabled]:active, input[type=submit][disabled]:active, t
.header-div {
line-height: normal;
vertical-align: middle;
overflow: hidden;
background-color: #2a2929;
}
@@ -264,7 +264,7 @@ input[disabled], button[disabled]:active, input[type=submit][disabled]:active, t
}
.anlegen-btn {
float:right;
float:right;
width: auto;
}
@@ -313,11 +313,11 @@ ul {
}
#menu-div {
overflow: hidden;
background-color: #2a2929;
margin-top: -1.8em;
margin-bottom: 1.3em;
float: right;
overflow: hidden;
background-color: #2a2929;
margin-top: -1.8em;
margin-bottom: 1.3em;
float: right;
width: auto;
}
/*#endregion*/
@@ -335,7 +335,7 @@ ul {
}
#recordLoader_select {
width: 100%;
width: 100%;
font-size:13px;
}
@@ -369,12 +369,12 @@ ul {
#popupDiv, #errorPopupDiv,#SuccessPopupDiv,#AendernPopupDiv {
width:90%;
height: 20%;
height: 20%;
background-color: #ffffff;
border: 1px solid #FF5A00;
display: none;
display: none;
margin: auto;
position: absolute;
position: absolute;
z-index: 900;
top: 0;
left: 0;
@@ -383,19 +383,19 @@ ul {
}
.popupBtn{
width: auto;
border: none;
width: auto;
border: none;
}
.SuccessPopupOkBtn,.AendernPopupOkBtn {
width: auto;
border: none;
width: auto;
border: none;
}
.SuccessPopupUSchrift,.AendernPopupUSchrift {
width: auto;
border: none;
width: auto;
border: none;
}
/*#endregion*/
@@ -464,7 +464,7 @@ textarea {
-o-animation: spin 2s ease infinite;
animation: spin 2s ease infinite;
}
@-moz-keyframes spin { 100% { -moz-transform: rotate(360deg);}}
@-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg);}}
@keyframes spin { 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg);}}
@@ -509,7 +509,7 @@ textarea {
.styled-select-div {
overflow: hidden;
background: url('images/toggle-icon-d.svg') no-repeat right;
background-position: 99.5% center;
background-position: 99.5% center;
border: 1px solid #bbb;
display: block;
}
@@ -523,7 +523,7 @@ textarea {
}
#sc-dropdown-container {
margin-bottom: .2em;
margin-bottom: .2em;
}
.styled-select-div select, .disabled-select-container select {
@@ -536,7 +536,7 @@ textarea {
-moz-appearance: none;
padding-left: 1em;
padding-right: 1.5em;
width: 100%;
width: 100%;
}
.styled-select-div select option:nth-child(odd) {
@@ -548,14 +548,14 @@ textarea {
}
#recordLoader_select_container {
width: 25%;
float: left;
width: 25%;
float: left;
margin-top: .5em;
}
#logout-form {
display: inline;
margin: 0;
display: inline;
margin: 0;
padding: 0;
}
@@ -568,7 +568,7 @@ textarea {
}
#popupBtnDiv, #errorPopupBtnDiv,#SuccessPopupBtnDiv,#AendernPopupDiv{
margin: 0 auto;
margin: 0 auto;
display: block;
}
@@ -683,7 +683,7 @@ article.infobox section h2 {
height: 29px;
font-size: 12px;
font-weight: normal;
margin: 0;
background-color: rgba(0, 0, 0, 0.1);
border-radius: 0 0 0 0;
@@ -726,7 +726,7 @@ article.infobox section:target, article.infobox section:target h2 {
color: #000000;
z-index: 1;
background-color: #FFFFFF;
border-color:#FF5A00;
border-color:#FF5A00;
}
article.infobox section:target h2 a {
@@ -754,4 +754,43 @@ article.infobox section:target h2 a {
.date-input-css {}
.select-container {}
.select-container {}
.text-module-popup-div-background {
display: none;
position: absolute;
width: 100%;
height: 100%;
z-index: 899;
top: 0;
left: 0;
bottom: 0;
right: 0;
background-color: #bbbbbb;
opacity: .5;
overflow: hidden;
}
.text-module-popup-div {
display: none;
position: absolute;
background-color: #ffffff;
border: 1px solid #FF5A00;
margin: auto;
width: 95%;
height: 50%;
z-index: 900;
padding: 2px;
top: 0;
left: 0;
bottom: 0;
right: 0;
overflow-y: scroll;
}
.kollabierbar-text-modules {
font-size: 13px;
color: #555555;
margin-top: -5px;
padding: .5em;
}

2
BeWoPlanerMobil/Models/MainModel.cs
View File

@@ -102,7 +102,7 @@ namespace BeWoPlanerMobil.Models
public static bool IsEmployeeSelectionVisible => MobileSessionFacade.CheckForUserRight(UserRightType.ServiceRecord_AllowCreationForOtherEmployees) || MobileSessionFacade.CheckForUserRight(UserRightType.ServiceRecord_AllowCreationForOtherTeamMember);
public static bool IsTextbausteineVisible => false; //MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineAlleAnsehen) || MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineNurEigeneAnsehen);
public static bool IsTextbausteineVisible => MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineAlleAnsehen) || MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineNurEigeneAnsehen);
public bool ShowDistanceField { get; set; }

2
BeWoPlanerMobil/Scripts/gruppenbuchung.js
View File

@@ -27,7 +27,6 @@ function removeSupportConceptFromList(pSelectedSupportConceptOid, event) {
function addEmployeeToGruppenbuchung(event) {
var selectedEmployeeOid = $("#groupBookingEmployeesDropDown").find(":selected").val();
// if($(`#employee_tr_${selectedEmployeeOid}`).length === 0) {
if($('#employee_tr_' + selectedEmployeeOid).length === 0) {
showSanduhr();
@@ -71,7 +70,6 @@ function addSupportConceptGroupToGroupBooking(event) {
for(var i = 0; i < supportConceptOids.length; i++) {
var isSelected = $('#supportconcept_tr_' + supportConceptOids[i]).length !== 0;
//console.log(`support concept oid: ${supportConceptOids[i]}; is already selected: ${isSelected}`);
console.log('support concept oid: ' + supportConceptOids[i] + '; is already selected: ' + isSelected);
if(supportConceptOids[i] !== "0" && $('#supportconcept_tr_' + supportConceptOids[i]).length === 0) {

4
BeWoPlanerMobil/Scripts/initialization.js
View File

@@ -143,7 +143,6 @@ function initBeWoMobile(actionPath) {
$("#anlegenEditierenBtn").prop("disabled", (supportConceptTableHasEntries === 0 || employeesTableHasEntries === 0));
}
} catch(err) {
//console.log(`Fehler: ${err.message}`);
console.log('Fehler: ' + err.message);
}
}
@@ -251,9 +250,6 @@ function initializeDocumentationTextareas() {
for(var i = 0; i < numberOfDocumentationTypes; i++) {
var idNumber = i + 1;
//$(`#DokName${idNumber}`).text(documentationTypes[i].TypeDescription);
//$(`#Dokumentation${idNumber}`).css("display", "block");
$('#DokName' + idNumber).text(documentationTypes[i].TypeDescription);
$('#Dokumentation' + idNumber).css("display", "block");
}

25
BeWoPlanerMobil/Scripts/mainView.js
View File

@@ -231,9 +231,9 @@ function setTextModule(moduleOid) {
}
}
console.log('Id der fokussierten DokuTextarea: ' + window.focusedDokuTextarea.attr("id"));
window.focusedDokuTextarea.val(window.focusedDokuTextarea.val() + allTextModules[moduleOid].Text);
hideTextModulePopup();
}
function setTextbaustein() {
@@ -1213,7 +1213,6 @@ function loescheUnterschrift(canvas, ctx) {
}
function preloadData(serviceRecordOid) {
initSignatureInfo(serviceRecordOid);
}
@@ -1795,3 +1794,23 @@ function focusOnTab(tabIdentifier) {
window.focusedDokuTextarea = $('#notiz_textbox' + tabIdentifier);
}, 100);
}
function showTextModulesPopup() {
$("#kollabierbar2").css("display", "block");
$("#textModulePopupDivContainer").css("display", "block");
$("#textModulePopupDivContainer").css("height", $("body").css("height"));
$("#textModulePopupDiv").css("display", "block");
var destination = $("#textModulesTr").offset();
var outerHeight = $("#textModulePopupDiv").outerHeight();
$("#textModulePopupDiv").css({ top: destination.top - outerHeight });
}
function hideTextModulePopup() {
$("#textModulePopupDivContainer").css("display", "none");
$("#textModulePopupDiv").css("display", "none");
$("#kollabierbar2").css("display", "none");
}

22
BeWoPlanerMobil/Views/Main/Main.cshtml
View File

@@ -13,7 +13,7 @@
<div id="colorRibbon"></div>
<div id="menu-div" style="display: none; position: absolute; right: 0; z-index: 10;">
<ul class="dark-bg">
<li class="menu-item menu-link" onclick="showCustomers()" @{if (!MainModel.IsAllowedToSeeCustomers) { @Html.Raw("style='display: none;'") }}>
<li class="menu-item menu-link" onclick="showCustomers()" @{if(!MainModel.IsAllowedToSeeCustomers) { @Html.Raw("style='display: none;'") }}>
<img src="@Url.Content("~/Content/images/klientenicon.svg")" alt="K" class="menu-img" />Klienten
</li>
@@ -27,7 +27,7 @@
<li class="menu-item">
<img src="@Url.Content("~/Content/images/abmeldeicon.svg")" alt="A" class="abmelden-img" />
@using (Html.BeginForm("Logout", "Main", FormMethod.Post, new { @id = "logout-form" }))
@using(Html.BeginForm("Logout", "Main", FormMethod.Post, new { id = "logout-form" }))
{
<input type="submit" value="Abmelden" class="logout-btn" onclick="clearRecords(); showSanduhr();" />
}
@@ -52,7 +52,7 @@
@Html.LabelFor(m => m.ShowExpiredSupportConcepts, new {id = "LabelForShowExpiredSupportConceptsCB"})
}
@using(Html.BeginForm("SetGroupBookingMode", "Main", FormMethod.Post, new { @style = "display: none;"}))
@using(Html.BeginForm("SetGroupBookingMode", "Main", FormMethod.Post, new { style = "display: none;"}))
{
@Html.CheckBoxFor(m => m.IsInGroupBookingMode, new {onchange = "showSanduhr();this.form.submit();", id = "changeBookingModeCheckBox"})
@Html.LabelFor(m => m.IsInGroupBookingMode, new {id = "labelForChangeBookingModeCheckBox"})
@@ -297,13 +297,9 @@
</div>
</td>
</tr>
<tr @(MainModel.IsTextbausteineVisible ? Html.Raw("style='display: table-row;'") : Html.Raw("style='display: none;'"))>
<tr id="textModulesTr" @(MainModel.IsTextbausteineVisible ? Html.Raw("style='display: table-row;'") : Html.Raw("style='display: none;'"))>
<td colspan="2">
<div class="collapsible-container">
<input type="button" id="kollabier-btn2" class="toggle-btn" value="Textbausteine" disabled/>
<div id="kollabierbar2" style="display: none; margin-right: 0; padding-right: 0;" class="kollabierbar">
</div>
</div>
<input type="button" id="kollabier-btn2" class="toggle-btn" value="Textbausteine" onclick="showTextModulesPopup()" disabled />
</td>
</tr>
<tr id="trnormalDoku" style="display: none;">
@@ -689,6 +685,12 @@
</div>
</div>
<div id="textModulePopupDivContainer" class="text-module-popup-div-background" onclick="hideTextModulePopup()"></div>
<div id="textModulePopupDiv" class="text-module-popup-div">
<div id="kollabierbar2" style="display: none; margin-right: 0; padding-right: 0;" class="kollabierbar-text-modules">
</div>
</div>
<div id="klienten">
<div class="combobox-label-parent">
@Html.LabelFor(m => m.SelectedCustomerOid)
@@ -823,7 +825,7 @@
</tr>
</table>
</div>-->
</div>
</div>
<div style="padding-right: 1em;" id="umfeldContainer">
<h4 style="display: inline; color: #AB4A07;">Umfeld</h4>
<hr />