diff options
Diffstat (limited to 'protected/views/myAngebot')
| -rw-r--r-- | protected/views/myAngebot/_angebot_form.php | 12 | ||||
| -rw-r--r-- | protected/views/myAngebot/_form.php | 93 |
2 files changed, 19 insertions, 86 deletions
diff --git a/protected/views/myAngebot/_angebot_form.php b/protected/views/myAngebot/_angebot_form.php index ca1ba6f..2ec84e7 100644 --- a/protected/views/myAngebot/_angebot_form.php +++ b/protected/views/myAngebot/_angebot_form.php @@ -1,14 +1,12 @@ <div class="form"> <?php $form=$this->beginWidget('CActiveForm', array( - 'id'=>'angebot-form', - 'enableAjaxValidation'=>false, + 'id'=>'angebot-dialog-form', + 'enableAjaxValidation'=>true, )); ?> <?php $this->renderPartial('/common/_required_fields_text'); ?> - <?php echo $form->errorSummary($model); ?> - <div class="row"> <?php echo $form->labelEx($model,'kategorie_id'); ?> <?php echo $form->dropDownList($model, "kategorie_id", CHtml::listData($kategorien, "id", "name"), array('empty' => '-- Bitte Kategorie wählen --')); ?> @@ -37,12 +35,6 @@ <?php echo $form->error($model,'beschreibung'); ?> </div> - <div class="row"> - <?php echo $form->labelEx($model,'published'); ?> - <?php echo $form->checkbox($model,'published'); ?> - <?php echo $form->error($model,'published'); ?> - </div> - <div class="row buttons"> <?php echo CHtml::submitButton($model->isNewRecord ? 'Erstellen' : 'Speichern'); ?> </div> diff --git a/protected/views/myAngebot/_form.php b/protected/views/myAngebot/_form.php index 2abd64d..0ee91d5 100644 --- a/protected/views/myAngebot/_form.php +++ b/protected/views/myAngebot/_form.php @@ -1,3 +1,5 @@ +<?php Html::registerJavascript("angebotverein.js"); ?> + <div class="form"> <?php $form=$this->beginWidget('CActiveForm', array( @@ -21,38 +23,7 @@ 'select'=>'js:function(event, ui) { return selectAngebot(ui.item); }', - 'change'=>'js:function( event ) { - var autocomplete = $( this ).data( "autocomplete" ); - if (autocomplete.selectedItem ) { return; } - var fullMatcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( $(this).val() ) + "$", "i" ); - var partMatcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( $(this).val() ), "i" ); - autocomplete.widget().children( ".ui-menu-item" ).each(function() { - var item = $(this).data("item.autocomplete"); - if (fullMatcher.test( item.label)) { - autocomplete.selectedItem = item; - return false; - } else if (partMatcher.test(item.label)) { - var conf = confirm("Meinten Sie \""+item.label+"\"?"); - if (conf) { - autocomplete.selectedItem = item; - return false; - } - } - }); - if (autocomplete.selectedItem) { - autocomplete._trigger("select", event, { item: autocomplete.selectedItem } ); - } else { - var selectObj = $("#AngebotVerein_einheit")[0]; - selectObj.style.display = "none"; - $("#emptyEinheitenTxt")[0].style.display = "inline"; - $("#createNewMasterAngebot")[0].style.display = "inline"; - var selectParentNode = selectObj.parentNode; - var newSelectObj = selectObj.cloneNode(false); // Make a shallow copy - selectParentNode.replaceChild(newSelectObj, selectObj); - - $("#AngebotVerein_angebot_id").val(""); - } - }', + 'change'=>'js:changeAngebot', ), 'htmlOptions'=>array( 'style'=>'height:20px;', @@ -63,8 +34,6 @@ <?php echo $form->error($model, 'angebot_id'); ?> </div> - <span id="createNewMasterAngebot" style="display:none">CREATE</span> - <div class="row"> <?php echo $form->labelEx($model,'menge'); ?> <?php echo $form->textField($model,'menge',array('size'=>60,'maxlength'=>80)); ?> @@ -109,11 +78,6 @@ */ ?> -<?php echo CHtml::link('Neues Angebot erstellen', "", // the link for open the dialog - array( - 'style'=>'cursor: pointer; text-decoration: underline;', - 'onclick'=>"{addAngebot(); $('#angebotDialog').dialog('open');}"));?> - <?php $this->beginWidget('zii.widgets.jui.CJuiDialog', array( // the dialog 'id'=>'angebotDialog', @@ -122,7 +86,7 @@ $this->beginWidget('zii.widgets.jui.CJuiDialog', array( // the dialog 'autoOpen'=>false, 'modal'=>true, 'width'=>550, - 'height'=>470, + 'height'=>505, ), ));?> <div class="divForForm"></div> @@ -130,49 +94,26 @@ $this->beginWidget('zii.widgets.jui.CJuiDialog', array( // the dialog <?php $this->endWidget();?> <script type="text/javascript"> -function addAngebot() { +function openAngebotDialog() { <?php echo CHtml::ajax(array( 'url'=>array('myAngebot/createAngebot'), - 'data'=> "js:$(this).serialize()", + 'data'=>'js:$("#angebot_name").serialize()', 'type'=>'post', 'dataType'=>'json', - 'success'=>"function(data) { - if (data.status == 'failure') { - $('#angebotDialog div.divForForm').html(data.div); - // Here is the trick: on submit-> once again this function! - $('#angebotDialog div.divForForm form').submit(addAngebot); - } else { - $('#angebotDialog div.divForForm').html(data.div); - setTimeout(\"$('#angebotDialog').dialog('close') \",3000); - selectAngebot(data); - } - }", - ))?>; + 'success'=>'angebotVereinDialog', + )); ?> + $('#angebotDialog').dialog('open'); // Open Angebot dialog return false; } -function selectAngebot(angebot) { - $("#AngebotVerein_angebot_id").val(angebot.value); - $("#angebot_name").val(angebot.label); - var selectObj = $("#AngebotVerein_einheit")[0]; - selectObj.style.display = "inline"; - $("#emptyEinheitenTxt")[0].style.display = "none"; - $("#createNewMasterAngebot")[0].style.display = "none"; - var selectParentNode = selectObj.parentNode; - var newSelectObj = selectObj.cloneNode(false); // Make a shallow copy - selectParentNode.replaceChild(newSelectObj, selectObj); - var count = 0; - var einheiten = angebot.einheiten.split(","); - for (i in einheiten) { - var str = einheiten[i].replace(/^\s+/, ""); - for (var i = str.length - 1; i >= 0; i--) { - if (/\S/.test(str.charAt(i))) { - str = str.substring(0, i + 1); - break; - } - } - newSelectObj.options[count++] = new Option(str, str); - } +function createAngebot() { + <?php echo CHtml::ajax(array( + 'url'=>array('myAngebot/createAngebot'), + 'data'=>'js:$(this).serialize()', + 'type'=>'post', + 'dataType'=>'json', + 'success'=>'angebotVereinDialog', + )); ?> return false; } </script>
\ No newline at end of file |