From 11f4b086b78578507a1c9a1470075b8dd9c5fe20 Mon Sep 17 00:00:00 2001 From: Sada Shiva Date: Tue, 2 Feb 2016 18:39:22 +0530 Subject: [PATCH] Merge Branch --- .gitignore | 3 +- .../Admin/helpdesk/SettingsController.php | 21 ++- .../Agent/helpdesk/TicketController.php | 10 + app/Http/routes.php | 16 +- ...2016_01_25_075608_create_tickets_table.php | 2 + .../2016_02_01_052219_settings_ratings.php | 52 ++++++ nbproject/project.properties | 7 + nbproject/project.xml | 9 + public/lb-faveo/dist/css/jquery.rating.css | 12 ++ public/lb-faveo/dist/images/delete.gif | Bin 0 -> 752 bytes public/lb-faveo/dist/images/star.gif | Bin 0 -> 815 bytes public/lb-faveo/dist/images/stars.png | Bin 0 -> 3945 bytes public/lb-faveo/dist/js/jquery.rating.pack.js | 9 + resources/lang/en/lang.php | 4 +- .../admin/helpdesk/settings/ratings.blade.php | 171 ++++++++++++++++++ .../agent/helpdesk/ticket/timeline.blade.php | 31 +++- .../default1/agent/layout/agent.blade.php | 36 +++- .../client/helpdesk/ckeckticket.blade.php | 105 ++++++++++- .../default1/client/layout/client.blade.php | 2 + vendor/composer/autoload_classmap.php | 130 ++++++------- 20 files changed, 542 insertions(+), 78 deletions(-) create mode 100644 database/migrations/2016_02_01_052219_settings_ratings.php create mode 100644 nbproject/project.properties create mode 100644 nbproject/project.xml create mode 100644 public/lb-faveo/dist/css/jquery.rating.css create mode 100644 public/lb-faveo/dist/images/delete.gif create mode 100644 public/lb-faveo/dist/images/star.gif create mode 100644 public/lb-faveo/dist/images/stars.png create mode 100644 public/lb-faveo/dist/js/jquery.rating.pack.js create mode 100644 resources/views/themes/default1/admin/helpdesk/settings/ratings.blade.php diff --git a/.gitignore b/.gitignore index 30bc16279..e9c8e8112 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/node_modules \ No newline at end of file +/node_modules +/nbproject/private/ \ No newline at end of file diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController.php b/app/Http/Controllers/Admin/helpdesk/SettingsController.php index 9f3bd209c..4b3e18aea 100644 --- a/app/Http/Controllers/Admin/helpdesk/SettingsController.php +++ b/app/Http/Controllers/Admin/helpdesk/SettingsController.php @@ -27,6 +27,7 @@ use App\Model\helpdesk\Utility\Time_format; use Illuminate\Http\Request; use Input; use Exception; +use DB; /** * SettingsController @@ -54,7 +55,25 @@ class SettingsController extends Controller { public function settings() { return view('themes.default1.admin.helpdesk.setting'); } - +public function RatingSettings() { + $ratings = DB::table('settings_ratings')->get(); + + return view('themes.default1.admin.helpdesk.settings.ratings',compact('ratings')); + } + public function PostRatingSettings($slug) { + $name = Input::get('rating_name'); + $publish = Input::get('publish'); + $modify = Input::get('modify'); + + DB::table('settings_ratings')->whereSlug($slug)->update(array('rating_name' => $name,'publish' => $publish, 'modify' => $modify)); + + return redirect()->back()->with('success', 'Successfully updated'); + } + public function RatingDelete($slug) { + DB::table('settings_ratings')->whereSlug($slug)->delete(); + + return redirect()->back()->with('success', 'Successfully Deleted'); + } /** * @param int $id * @return Response diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 01514501b..09fe3ab29 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -2182,5 +2182,15 @@ class TicketController extends Controller { return view('themes.default1.agent.helpdesk.dept-ticket.inprogress',compact('id')); } } + public function rating($id,$rating) { + + Tickets::where('id', $id)->update(array('rating' => $rating)); + return redirect()->back()->with('Success','Thank you for your rating!'); + } + public function ratingReply($id,$rating) { + + Tickets::where('id', $id)->update(array('ratingreply' => $rating)); + return redirect()->back()->with('Success','Thank you for your rating!'); + } } diff --git a/app/Http/routes.php b/app/Http/routes.php index 65ddc7911..b4ef3ebad 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -1,6 +1,6 @@ 'role.agent', 'middleware' => 'auth'], function () Route::get('agen1', 'Agent\helpdesk\DashboardController@ChartData'); - Route::post('chart-range', ['as' => 'post.chart', 'uses' => 'Agent\helpdesk\DashboardController@ChartData']); + Route::post('chart-range/{date1}/{date2}', ['as' => 'post.chart', 'uses' => 'Agent\helpdesk\DashboardController@ChartData']); Route::resource('user', 'Agent\helpdesk\UserController'); /* User router is used to control the CRUD of user */ @@ -216,7 +216,11 @@ Route::group(['middleware' => 'role.agent', 'middleware' => 'auth'], function () Route::get('/test', ['as' => 'thr', 'uses' => 'Agent\helpdesk\MailController@fetchdata']); /* Fetch Emails */ - Route::get('/ticket', ['as' => 'ticket', 'uses' => 'Agent\helpdesk\TicketController@ticket_list']); /* Get Ticket */ + Route::post('rating/{id}/{rating}', ['as' => 'ticket.rating' , 'uses' => 'Agent\helpdesk\TicketController@rating']); /* Get overall Ratings */ + + Route::post('rating2/{id}/{rating}', ['as' => 'ticket.rating2' , 'uses' => 'Agent\helpdesk\TicketController@ratingReply']); /* Get reply Ratings */ + + Route::get('/ticket', ['as' => 'ticket', 'uses' => 'Agent\helpdesk\TicketController@ticket_list']); /* Get Ticket */ Route::get('/ticket/inbox', ['as' => 'inbox.ticket', 'uses' => 'Agent\helpdesk\TicketController@inbox_ticket_list']); /* Get Inbox Ticket */ @@ -529,6 +533,12 @@ $router->get('test', 'ArticleController@test'); $router->post('image', 'Agent\kb\SettingsController@image'); +Route::get('getratings', 'Admin\helpdesk\SettingsController@RatingSettings'); +Route::get('deleter/{rating}',[ + 'as'=>'ratings.delete' ,'uses'=>'Admin\helpdesk\SettingsController@RatingDelete' + ]); +Route::patch('postratings/{slug}',['as'=>'settings.rating','uses'=> 'Admin\helpdesk\SettingsController@PostRatingSettings']); + $router->get('direct', function () { return view('direct'); }); diff --git a/database/migrations/2016_01_25_075608_create_tickets_table.php b/database/migrations/2016_01_25_075608_create_tickets_table.php index 0223ce530..ecfcccd25 100644 --- a/database/migrations/2016_01_25_075608_create_tickets_table.php +++ b/database/migrations/2016_01_25_075608_create_tickets_table.php @@ -26,6 +26,8 @@ class CreateTicketsTable extends Migration { $table->integer('flags'); $table->integer('ip_address'); $table->integer('assigned_to')->unsigned()->nullable()->index('assigned_to'); + $table->integer('rating'); + $table->integer('ratingreply'); $table->integer('lock_by'); $table->integer('lock_at'); $table->integer('source')->unsigned()->nullable()->index('source'); diff --git a/database/migrations/2016_02_01_052219_settings_ratings.php b/database/migrations/2016_02_01_052219_settings_ratings.php new file mode 100644 index 000000000..379444d8c --- /dev/null +++ b/database/migrations/2016_02_01_052219_settings_ratings.php @@ -0,0 +1,52 @@ +increments('id'); + $table->string('rating_name'); + $table->integer('publish'); + $table->integer('modify'); + $table->string('slug')->unique(); + $table->timestamps(); + }); + DB::table('settings_ratings')->insert(array( + array( + 'rating_name' => 'Overall Rating', + 'publish' => '1', + 'modify' => '1', + 'slug' => Str::slug(ucfirst('Overall Rating')) + ), + array( + 'rating_name' => 'Reply Rating', + 'publish' => '1', + 'modify' => '1', + 'slug' => Str::slug(ucfirst('Reply Rating')) + ) + ) + ); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('settings_ratings'); + } + +} diff --git a/nbproject/project.properties b/nbproject/project.properties new file mode 100644 index 000000000..d37ef9563 --- /dev/null +++ b/nbproject/project.properties @@ -0,0 +1,7 @@ +include.path=${php.global.include.path} +php.version=PHP_54 +source.encoding=UTF-8 +src.dir=. +tags.asp=false +tags.short=false +web.root=. diff --git a/nbproject/project.xml b/nbproject/project.xml new file mode 100644 index 000000000..035db715d --- /dev/null +++ b/nbproject/project.xml @@ -0,0 +1,9 @@ + + + org.netbeans.modules.php.project + + + Faveo.v1.0.5.2 + + + diff --git a/public/lb-faveo/dist/css/jquery.rating.css b/public/lb-faveo/dist/css/jquery.rating.css new file mode 100644 index 000000000..2f2389177 --- /dev/null +++ b/public/lb-faveo/dist/css/jquery.rating.css @@ -0,0 +1,12 @@ +/* jQuery.Rating Plugin CSS - http://www.fyneworks.com/jquery/star-rating/ */ +div.rating-cancel,div.star-rating{float:left;width:17px;height:15px;text-indent:-999em;cursor:pointer;display:block;background:transparent;overflow:hidden} +div.rating-cancel,div.rating-cancel a{background:url('http://stsinfosystems.kayako.com/__swift/themes/client/images/icon_ratingdelete.gif') no-repeat 0 -16px} +div.star-rating,div.star-rating a{background:url('http://stsinfosystems.kayako.com/__swift/themes/client/images/icon_ratingstar.gif') no-repeat 0 0px} +div.rating-cancel a,div.star-rating a{display:block;width:16px;height:100%;background-position:0 0px;border:0} +div.star-rating-on a{background-position:0 -16px!important} +div.star-rating-hover a{background-position:0 -32px} +/* Read Only CSS */ +div.star-rating-readonly a{cursor:default !important} +/* Partial Star CSS */ +div.star-rating{background:transparent!important;overflow:hidden!important} +/* END jQuery.Rating Plugin CSS */ \ No newline at end of file diff --git a/public/lb-faveo/dist/images/delete.gif b/public/lb-faveo/dist/images/delete.gif new file mode 100644 index 0000000000000000000000000000000000000000..43c6ca8763d79bde87bcf437e497af00c8be562d GIT binary patch literal 752 zcmZ?wbhEHb6kt$bc*el6GthYN-n}zt&b)vB{*)i+-#|NQy$ zABXln&Q1FL`t{#CH*SY|{oJwc*Qz;h;)0))7aYq9ewP~fc2e)_P3vAY)$9wl{IzJp zy{ydlr;a^HiGHwZ{*SH8FZkJhE{gei`OM?;ir*_{?@ji478&@mD*tSH_`A&5@6Vqe z@G<&xeCOwiq-WvY-eS5f?;vgCP8#IHGBw=+^cY}xvy zx8c*8mDl2ff1W;kCeZrNm9vlQYJg5Caki?(^G9DBs4DA0KlA4-ZT3fl8 z8F_gb*}2-1v>0WWwY1oIg_&Emc-aM+Wn|bpRc1GF^$N-etzA1qr9X*XNNWw_j-BjG zGEKc(x)1gUF{(82E@ad^eMXp9hUxg0Q)f<}lVRDncBb&%dq*yAR+(|l-D@bZwvw%g)cL7VG z)An_f*+XqOetkIP*eg{wS7K(+qJ{-x0ue3?v&y~1d1To>MqD_2keNGNE=Pc|!BJ7b fV_(F^#N=Z_Jo9)pKRPly^YODPxtB5!M# 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 DFGF4t literal 0 HcmV?d00001 diff --git a/public/lb-faveo/dist/js/jquery.rating.pack.js b/public/lb-faveo/dist/js/jquery.rating.pack.js new file mode 100644 index 000000000..10bbeb217 --- /dev/null +++ b/public/lb-faveo/dist/js/jquery.rating.pack.js @@ -0,0 +1,9 @@ +/* + ### jQuery Star Rating Plugin v4.11 - 2013-03-14 ### + * Home: http://www.fyneworks.com/jquery/star-rating/ + * Code: http://code.google.com/p/jquery-star-rating-plugin/ + * + * Licensed under http://en.wikipedia.org/wiki/MIT_License + ### +*/ +eval(function(p,a,c,k,e,r){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}(';5(1W.1C)(8($){5((!$.1s.1V&&!$.1s.1U))2d{1j.1X("1T",C,s)}1R(e){};$.o.4=8(j){5(3.u==0)9 3;5(M V[0]==\'1m\'){5(3.u>1){7 k=V;9 3.18(8(){$.o.4.K($(3),k)})};$.o.4[V[0]].K(3,$.27(V).26(1)||[]);9 3};7 j=$.1b({},$.o.4.1w,j||{});$.o.4.P++;3.1y(\'.l-4-1g\').p(\'l-4-1g\').18(8(){7 b,m=$(3);7 c=(3.2g||\'28-4\').1f(/\\[|\\]/g,\'Y\').1f(/^\\Y+|\\Y+$/g,\'\');7 d=$(3.2h||1j.1H);7 e=d.6(\'4\');5(!e||e.1o!=$.o.4.P)e={E:0,1o:$.o.4.P};7 f=e[c]||d.6(\'4\'+c);5(f)b=f.6(\'4\');5(f&&b)b.E++;R{b=$.1b({},j||{},($.1d?m.1d():($.25?m.6():w))||{},{E:0,L:[],v:[]});b.z=e.E++;f=$(\'<1G 13="l-4-1I"/>\');m.1J(f);f.p(\'4-12-11-10\');5(m.Z(\'G\')||m.14(\'G\'))b.n=s;5(m.14(\'1c\'))b.1c=s;f.1r(b.D=$(\'\'+b.1B+\'\').q(\'1e\',8(){$(3).4(\'N\');$(3).p(\'l-4-T\')}).q(\'1h\',8(){$(3).4(\'x\');$(3).I(\'l-4-T\')}).q(\'1i\',8(){$(3).4(\'y\')}).6(\'4\',b))};7 g=$(\'\'+3.1k+\'\');f.1r(g);5(3.X)g.Z(\'X\',3.X);5(3.1x)g.p(3.1x);5(b.29)b.B=2;5(M b.B==\'1l\'&&b.B>0){7 h=($.o.15?g.15():0)||b.1n;7 i=(b.E%b.B),17=1K.1L(h/b.B);g.15(17).1M(\'a\').1N({\'1O-1P\':\'-\'+(i*17)+\'1Q\'})};5(b.n)g.p(\'l-4-1p\');R g.p(\'l-4-1S\').q(\'1e\',8(){$(3).4(\'1q\');$(3).4(\'J\')}).q(\'1h\',8(){$(3).4(\'x\');$(3).4(\'H\')}).q(\'1i\',8(){$(3).4(\'y\')});5(3.S)b.r=g;5(3.1Y=="A"){5($(3).14(\'1Z\'))b.r=g};m.1t();m.q(\'1u.4\',8(a){5(a.1v)9 C;$(3).4(\'y\')});g.6(\'4.m\',m.6(\'4.l\',g));b.L[b.L.u]=g[0];b.v[b.v.u]=m[0];b.t=e[c]=f;b.23=d;m.6(\'4\',b);f.6(\'4\',b);g.6(\'4\',b);d.6(\'4\',e);d.6(\'4\'+c,f)});$(\'.4-12-11-10\').4(\'x\').I(\'4-12-11-10\');9 3};$.1b($.o.4,{P:0,J:8(){7 a=3.6(\'4\');5(!a)9 3;5(!a.J)9 3;7 b=$(3).6(\'4.m\')||$(3.19==\'1a\'?3:w);5(a.J)a.J.K(b[0],[b.Q(),$(\'a\',b.6(\'4.l\'))[0]])},H:8(){7 a=3.6(\'4\');5(!a)9 3;5(!a.H)9 3;7 b=$(3).6(\'4.m\')||$(3.19==\'1a\'?3:w);5(a.H)a.H.K(b[0],[b.Q(),$(\'a\',b.6(\'4.l\'))[0]])},1q:8(){7 a=3.6(\'4\');5(!a)9 3;5(a.n)9;3.4(\'N\');3.1z().1A().O(\'.t-\'+a.z).p(\'l-4-T\')},N:8(){7 a=3.6(\'4\');5(!a)9 3;5(a.n)9;a.t.2a().O(\'.t-\'+a.z).I(\'l-4-q\').I(\'l-4-T\')},x:8(){7 a=3.6(\'4\');5(!a)9 3;3.4(\'N\');7 b=$(a.r);7 c=b.u?b.1z().1A().O(\'.t-\'+a.z):w;5(c)c.p(\'l-4-q\');a.D[a.n||a.1c?\'1t\':\'2b\']();3.2c()[a.n?\'p\':\'I\'](\'l-4-1p\')},y:8(a,b){7 c=3.6(\'4\');5(!c)9 3;5(c.n)9;c.r=w;5(M a!=\'F\'||3.u>1){5(M a==\'1l\')9 $(c.L[a]).4(\'y\',F,b);5(M a==\'1m\'){$.18(c.L,8(){5($(3).6(\'4.m\').Q()==a)$(3).4(\'y\',F,b)});9 3}}R{c.r=3[0].19==\'1a\'?3.6(\'4.l\'):(3.2e(\'.t-\'+c.z)?3:w)};3.6(\'4\',c);3.4(\'x\');7 d=$(c.r?c.r.6(\'4.m\'):w);7 e=$(c.v).O(\':S\');7 f=$(c.v).1y(d);f.1D(\'S\',C);d.1D(\'S\',s);$(d.u?d:e).2f({1E:\'1u\',1v:s});5((b||b==F)&&c.1F)c.1F.K(d[0],[d.Q(),$(\'a\',c.r)[0]]);9 3},n:8(a,b){7 c=3.6(\'4\');5(!c)9 3;c.n=a||a==F?s:C;5(b)$(c.v).Z("G","G");R $(c.v).2i("G");3.6(\'4\',c);3.4(\'x\')},2j:8(){3.4(\'n\',s,s)},2k:8(){3.4(\'n\',C,C)}});$.o.4.1w={D:\'2l 2m\',1B:\'\',B:0,1n:16};$(8(){$(\'m[1E=2n].l\').4()})})(1C);',62,148,'|||this|rating|if|data|var|function|return||||||||||||star|input|readOnly|fn|addClass|on|current|true|rater|length|inputs|null|draw|select|serial||split|false|cancel|count|undefined|disabled|blur|removeClass|focus|apply|stars|typeof|drain|filter|calls|val|else|checked|hover|title|arguments|div|id|_|attr|drawn|be|to|class|hasClass|width||spw|each|tagName|INPUT|extend|required|metadata|mouseover|replace|applied|mouseout|click|document|value|number|string|starWidth|call|readonly|fill|append|support|hide|change|selfTriggered|options|className|not|prevAll|addBack|cancelValue|jQuery|prop|type|callback|span|body|control|before|Math|floor|find|css|margin|left|px|catch|live|BackgroundImageCache|style|opacity|window|execCommand|nodeName|selected|role|text|aria|context|label|meta|slice|makeArray|unnamed|half|children|show|siblings|try|is|trigger|name|form|removeAttr|disable|enable|Cancel|Rating|radio'.split('|'),0,{})) \ No newline at end of file diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index da026ba97..6107f776c 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -21,7 +21,9 @@ return array( 'success' => 'Success', 'fails' => 'Fails', 'alert' => 'Alert', - + 'ratings' => 'Ratings', + 'please_rate' => 'Please rate:', + 'ticket_ratings' => 'TICKET RATING', /* |-------------------------------------- | Login Page diff --git a/resources/views/themes/default1/admin/helpdesk/settings/ratings.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/ratings.blade.php new file mode 100644 index 000000000..c8b22d21d --- /dev/null +++ b/resources/views/themes/default1/admin/helpdesk/settings/ratings.blade.php @@ -0,0 +1,171 @@ +@extends('themes.default1.admin.layout.admin') + +@section('Settings') +class="active" +@stop + +@section('settings-bar') +active +@stop + +@section('system') +class="active" +@stop + +@section('HeadInclude') + +@stop + +@section('PageHeader') + +@stop + + +@section('breadcrumbs') +
    + +
+@stop + + +@section('content') + +
+
+

{{Lang::get('lang.ratings')}}

+
+@if(Session::has('success')) +
+ + Success! + + {{Session::get('success')}} +
+ @endif + + @if(Session::has('fails')) +
+ + Fail! + + {{Session::get('fails')}} +
+ @endif + +
+ + + + + + + + + + + + + @foreach($ratings as $rating) + + + + + + + + + @endforeach + +
IDTitleAction
{!! $rating->id !!}{!! $rating->rating_name !!} + + + + + + + + +
+ +
+ @stop +
\ No newline at end of file diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php index d3e8cc8bb..065dd6161 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php @@ -16,6 +16,7 @@ active ?> @section('sidebar') +
  • {!! Lang::get('lang.Ticket_Information') !!}
  • @@ -41,6 +42,19 @@ active @endif
    • + +
  • + {!! Lang::get('lang.ticket_ratings') !!} +
  • + + +
    + {!! $tickets->rating !!}
    + + +

    + {!! $tickets->ratingreply !!}

    +
    • @stop @section('content') @@ -1053,7 +1067,22 @@ $count_teams = count($teams); - {{-- // --}} - {{-- // --}} - - + + + @yield('HeadInclude') @@ -287,9 +311,7 @@ $group = App\Model\helpdesk\Agent\Groups::where('id', '=', $agent_group)->where( {!! Lang::get('lang.copyright') !!} © {!! date('Y') !!} {!! $company->company_name !!}. {!! Lang::get('lang.all_rights_reserved') !!}. {!! Lang::get('lang.powered_by') !!} Faveo - {{-- // --}} - - + {{-- // --}} diff --git a/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php b/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php index fac73421b..1acf8b10d 100644 --- a/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php +++ b/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php @@ -23,9 +23,12 @@ $thread = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id','=',\Crypt:
    - +
    +

    {{$thread->title}}

    ( {{$tickets->ticket_number}} )
    +
    +
    {{-- --}} @@ -42,6 +45,42 @@ $thread = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id','=',\Crypt:
    {!! Form::close() !!}
    +
    +
    +
    +
    +
    + + + +   + + + + + + +   + + +
    Overall Satisfaction  
    		 + rating=='1')?'checked':'' ?> /> + rating=='2')?'checked':'' ?> /> + rating=='3')?'checked':'' ?>/> + rating=='4')?'checked':'' ?>/> + rating=='5')?'checked':'' ?> /> +
    Reply rating  
    		 + ratingreply=='1')?'checked':'' ?> /> + ratingreply=='2')?'checked':'' ?> /> + ratingreply=='3')?'checked':'' ?> /> + ratingreply=='4')?'checked':'' ?> /> + ratingreply=='5')?'checked':'' ?> /> + +
    +
    +
    +
    +
    @@ -340,7 +379,71 @@ $data = $ConvDate[0]; +