Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Profile Sub Types Partial

  • Loading branch information...
commit bd39ae309880ddfa920e29aed5105400d7281611 1 parent 6dbea45
@DigitalTsotsi DigitalTsotsi authored
Showing with 15 additions and 40 deletions.
  1. +0 −11 Gemfile.lock
  2. 0  app/admin/dashboards.rb
  3. 0  app/admin/departments.rb
  4. 0  app/admin/icd_categories.rb
  5. 0  app/admin/icds.rb
  6. 0  app/admin/medical_aid_plans.rb
  7. 0  app/admin/medical_aids.rb
  8. +3 −0  app/admin/profile_sub_types.rb
  9. 0  app/admin/profile_types.rb
  10. 0  app/admin/relations.rb
  11. 0  app/admin/roles.rb
  12. 0  app/admin/users.rb
  13. 0  app/assets/javascripts/active_admin.js
  14. +6 −11 app/assets/javascripts/application.js
  15. 0  app/assets/javascripts/dependencies.js.coffee
  16. 0  app/assets/javascripts/orders.js.coffee
  17. +1 −1  app/assets/javascripts/people.js.coffee
  18. 0  app/assets/stylesheets/active_admin.css.scss
  19. 0  app/assets/stylesheets/dependencies.css.scss
  20. 0  app/assets/stylesheets/orders.css.scss
  21. 0  app/controllers/dependencies_controller.rb
  22. 0  app/controllers/orders_controller.rb
  23. +2 −2 app/controllers/profile_sub_types_controller.rb
  24. +1 −1  app/controllers/profile_types_controller.rb
  25. 0  app/helpers/dependencies_helper.rb
  26. 0  app/helpers/orders_helper.rb
  27. 0  app/models/dependency.rb
  28. 0  app/models/relation.rb
  29. 0  app/views/dependencies/create.html.erb
  30. 0  app/views/dependencies/destroy.html.erb
  31. 0  app/views/dependencies/edit.html.erb
  32. 0  app/views/dependencies/update.html.erb
  33. 0  app/views/orders/_form.html.haml
  34. 0  app/views/orders/edit.html.haml
  35. 0  app/views/orders/index.html.haml
  36. 0  app/views/orders/new.html.haml
  37. 0  app/views/orders/show.html.haml
  38. 0  app/views/people/_dependents.html.haml
  39. 0  app/views/people/_provider_relation.html.haml
  40. 0  app/views/people/_providers.html.haml
  41. +2 −1  app/views/person_profiles/getPsub.js.erb
  42. 0  config/initializers/active_admin.rb
  43. 0  db/migrate/20120521100239_recreate_person_relations.rb
  44. 0  db/migrate/20120521102716_create_dependencies.rb
  45. 0  db/migrate/20120521121832_drop_relation_type.rb
  46. 0  db/migrate/20120521122106_create_relations.rb
  47. 0  db/migrate/20120525121555_add_id_field_to_dependencies.rb
  48. 0  db/migrate/20120525151920_create_admin_notes.rb
  49. 0  db/migrate/20120525151921_move_admin_notes_to_comments.rb
  50. +0 −13 db/schema.rb
  51. 0  test/fixtures/dependencies.yml
  52. 0  test/fixtures/relations.yml
  53. 0  test/functional/dependencies_controller_test.rb
  54. 0  test/functional/orders_controller_test.rb
  55. 0  test/unit/dependency_test.rb
  56. 0  test/unit/helpers/dependencies_helper_test.rb
  57. 0  test/unit/helpers/orders_helper_test.rb
  58. 0  test/unit/relation_test.rb
View
11 Gemfile.lock
@@ -73,22 +73,16 @@ GEM
erubis (2.7.0)
execjs (1.3.0)
multi_json (~> 1.0)
-<<<<<<< HEAD
-=======
fastercsv (1.5.5)
formtastic (2.1.1)
actionpack (~> 3.0)
->>>>>>> 09af7109fb3c68ca17752ecdb3691dcb7e7b9812
haml (3.1.6)
haml-rails (0.3.4)
actionpack (~> 3.0)
activesupport (~> 3.0)
haml (~> 3.0)
railties (~> 3.0)
-<<<<<<< HEAD
-=======
has_scope (0.5.1)
->>>>>>> 09af7109fb3c68ca17752ecdb3691dcb7e7b9812
highline (1.6.11)
hike (1.2.1)
httparty (0.8.3)
@@ -234,12 +228,7 @@ DEPENDENCIES
coffee-rails (~> 3.2.1)
devise
haml-rails
-<<<<<<< HEAD
- jquery-datatables-rails!
- jquery-rails
-=======
jquery-datatables-rails
->>>>>>> 09af7109fb3c68ca17752ecdb3691dcb7e7b9812
jquery-ui-rails
jquery-ui-themes
meta_search (>= 1.1.0.pre)
View
0  app/admin/dashboards.rb 100644 → 100755
File mode changed
View
0  app/admin/departments.rb 100644 → 100755
File mode changed
View
0  app/admin/icd_categories.rb 100644 → 100755
File mode changed
View
0  app/admin/icds.rb 100644 → 100755
File mode changed
View
0  app/admin/medical_aid_plans.rb 100644 → 100755
File mode changed
View
0  app/admin/medical_aids.rb 100644 → 100755
File mode changed
View
3  app/admin/profile_sub_types.rb
@@ -0,0 +1,3 @@
+ActiveAdmin.register ProfileSubType do
+
+end
View
0  app/admin/profile_types.rb 100644 → 100755
File mode changed
View
0  app/admin/relations.rb 100644 → 100755
File mode changed
View
0  app/admin/roles.rb 100644 → 100755
File mode changed
View
0  app/admin/users.rb 100644 → 100755
File mode changed
View
0  app/assets/javascripts/active_admin.js 100644 → 100755
File mode changed
View
17 app/assets/javascripts/application.js
@@ -11,23 +11,21 @@
// GO AFTER THE REQUIRES BELOW.
//
//= require jquery
-<<<<<<< HEAD
+
//= require ajaxform
//= require jquery_ujs
-=======
->>>>>>> 09af7109fb3c68ca17752ecdb3691dcb7e7b9812
+
+
//= require twitter/bootstrap
//= require dataTables/jquery.dataTables
//= require jquery.ui.datepicker
//= require_tree .
-<<<<<<< HEAD
+
$(document).ready (function() {
$(document).on("change", ".ptid", function(){
- alert($(".ptid :selected").val());
-
- var selid = $(".ptid :selected").val();
+ var selid = $(".ptid :selected").val();
// make a POST call and replace the content
// $.post("getPSub", function(data) {
@@ -41,7 +39,4 @@ $(document).ready (function() {
})
});
-});
-=======
-
->>>>>>> 09af7109fb3c68ca17752ecdb3691dcb7e7b9812
+});
View
0  app/assets/javascripts/dependencies.js.coffee 100644 → 100755
File mode changed
View
0  app/assets/javascripts/orders.js.coffee 100644 → 100755
File mode changed
View
2  app/assets/javascripts/people.js.coffee
@@ -3,7 +3,7 @@
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
jQuery ->
$('#peopleData').dataTable()
- $('.datepicker').datepicker(option,{ changeYear: true });
+ $('.datepicker').datepicker({ changeYear: true });
#jQuery ->
View
0  app/assets/stylesheets/active_admin.css.scss 100644 → 100755
File mode changed
View
0  app/assets/stylesheets/dependencies.css.scss 100644 → 100755
File mode changed
View
0  app/assets/stylesheets/orders.css.scss 100644 → 100755
File mode changed
View
0  app/controllers/dependencies_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/orders_controller.rb 100644 → 100755
File mode changed
View
4 app/controllers/profile_sub_types_controller.rb
@@ -27,7 +27,7 @@ def new
end
def create
- @profile_sub_type = ProfileSubType.new(params[:profile_sub_type])
+ @profile_sub_type = ProfileSubType.new(params[:profile_sub_types])
respond_to do |format|
if @profile_sub_type.save
@@ -50,7 +50,7 @@ def update
@profile_sub_type = ProfileSubType.find(params[:id])
respond_to do |format|
- if @profile_sub_type.update_attributes(params[:profile_sub_types])
+ if @profile_sub_type.update_attributes(params[:profile_sub_type])
format.html { redirect_to @profile_sub_type, notice: 'Profile Sub Type was successfully updated.' }
format.json { head :no_content }
else
View
2  app/controllers/profile_types_controller.rb
@@ -50,7 +50,7 @@ def update
@profile_type = ProfileType.find(params[:id])
respond_to do |format|
- if @profile_type.update_attributes(params[:profile_types])
+ if @profile_type.update_attributes(params[:profile_type])
format.html { redirect_to @profile_type, notice: 'Profile Type was successfully updated.' }
format.json { head :no_content }
else
View
0  app/helpers/dependencies_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/orders_helper.rb 100644 → 100755
File mode changed
View
0  app/models/dependency.rb 100644 → 100755
File mode changed
View
0  app/models/relation.rb 100644 → 100755
File mode changed
View
0  app/views/dependencies/create.html.erb 100644 → 100755
File mode changed
View
0  app/views/dependencies/destroy.html.erb 100644 → 100755
File mode changed
View
0  app/views/dependencies/edit.html.erb 100644 → 100755
File mode changed
View
0  app/views/dependencies/update.html.erb 100644 → 100755
File mode changed
View
0  app/views/orders/_form.html.haml 100644 → 100755
File mode changed
View
0  app/views/orders/edit.html.haml 100644 → 100755
File mode changed
View
0  app/views/orders/index.html.haml 100644 → 100755
File mode changed
View
0  app/views/orders/new.html.haml 100644 → 100755
File mode changed
View
0  app/views/orders/show.html.haml 100644 → 100755
File mode changed
View
0  app/views/people/_dependents.html.haml 100644 → 100755
File mode changed
View
0  app/views/people/_provider_relation.html.haml 100644 → 100755
File mode changed
View
0  app/views/people/_providers.html.haml 100644 → 100755
File mode changed
View
3  app/views/person_profiles/getPsub.js.erb 100644 → 100755
@@ -1 +1,2 @@
-$(".ptid").after("<%=ProfileSubType.find(@selected_id).nil? ? "doesn't exist" : "exists" %>");
+$('#ptid').html("");
+$(".ptid").after("<div id='ptid'><%if ProfileSubType.find(@selected_id).nil? == false %> <% @profst = ProfileSubType.find_all_by_profile_type_id(@selected_id) %> <table><% @profst.each do |p| %><tr><td><%= p.name %></td></tr><%end%></table><%end%></div>");
View
0  config/initializers/active_admin.rb 100644 → 100755
File mode changed
View
0  db/migrate/20120521100239_recreate_person_relations.rb 100644 → 100755
File mode changed
View
0  db/migrate/20120521102716_create_dependencies.rb 100644 → 100755
File mode changed
View
0  db/migrate/20120521121832_drop_relation_type.rb 100644 → 100755
File mode changed
View
0  db/migrate/20120521122106_create_relations.rb 100644 → 100755
File mode changed
View
0  db/migrate/20120525121555_add_id_field_to_dependencies.rb 100644 → 100755
File mode changed
View
0  db/migrate/20120525151920_create_admin_notes.rb 100644 → 100755
File mode changed
View
0  db/migrate/20120525151921_move_admin_notes_to_comments.rb 100644 → 100755
File mode changed
View
13 db/schema.rb
@@ -208,19 +208,6 @@
t.datetime "updated_at", :null => false
end
- create_table "profiles", :force => true do |t|
- t.integer "person_id"
- t.integer "profile_type_id"
- t.string "description"
- t.date "time"
- t.integer "user_id"
- t.boolean "snapshot", :default => false
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
- end
-
- add_index "profiles", ["person_id"], :name => "index_profiles_on_person_id"
-
create_table "relations", :force => true do |t|
t.string "name"
end
View
0  test/fixtures/dependencies.yml 100644 → 100755
File mode changed
View
0  test/fixtures/relations.yml 100644 → 100755
File mode changed
View
0  test/functional/dependencies_controller_test.rb 100644 → 100755
File mode changed
View
0  test/functional/orders_controller_test.rb 100644 → 100755
File mode changed
View
0  test/unit/dependency_test.rb 100644 → 100755
File mode changed
View
0  test/unit/helpers/dependencies_helper_test.rb 100644 → 100755
File mode changed
View
0  test/unit/helpers/orders_helper_test.rb 100644 → 100755
File mode changed
View
0  test/unit/relation_test.rb 100644 → 100755
File mode changed
Please sign in to comment.
Something went wrong with that request. Please try again.