diff options
author | Smári McCarthy <smari@hilbert.(none)> | 2009-07-28 15:03:40 +0000 |
---|---|---|
committer | Smári McCarthy <smari@hilbert.(none)> | 2009-07-28 15:03:40 +0000 |
commit | 1ae9fd30ca7ae10c36b21fff2ec275c3f5a33b0c (patch) | |
tree | eadc6358cd409e75931c48b4014c8be8c80f2404 | |
parent | aca74dce52cec113598086c25e6b8f3e921dcf3b (diff) | |
download | tangiblebit-1ae9fd30ca7ae10c36b21fff2ec275c3f5a33b0c.tar.gz tangiblebit-1ae9fd30ca7ae10c36b21fff2ec275c3f5a33b0c.zip |
Removed unrelated stuff, improved orders model, made inventory model
-rw-r--r-- | server/fjarlog/__init__.py | 0 | ||||
-rw-r--r-- | server/fjarlog/models.py | 53 | ||||
-rw-r--r-- | server/fjarlog/views.py | 1 | ||||
-rw-r--r-- | server/inventory/models.py | 18 | ||||
-rw-r--r-- | server/orders/models.py | 2 | ||||
-rw-r--r-- | server/sources.sql | 621 | ||||
-rw-r--r-- | server/temp/undirflokkarsorted.csv | 465 | ||||
-rw-r--r-- | server/temp/yfirflokkar.sql | 15 | ||||
-rw-r--r-- | server/temp/yfirflokkarsorted.csv | 15 |
9 files changed, 18 insertions, 1172 deletions
diff --git a/server/fjarlog/__init__.py b/server/fjarlog/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/server/fjarlog/__init__.py +++ /dev/null diff --git a/server/fjarlog/models.py b/server/fjarlog/models.py deleted file mode 100644 index 7089c39..0000000 --- a/server/fjarlog/models.py +++ /dev/null @@ -1,53 +0,0 @@ -from django.db import models -from django.contrib.auth.models import User -from django.contrib import admin - -# Create your models here. - -class Budget(models.Model): - name = models.CharField(max_length=200) - - def __unicode__(self): - return self.name - -class BudgetCategory(models.Model): - budget = models.ForeignKey(Budget) - code = models.CharField(max_length=10) - name = models.CharField(max_length=200) - parent = models.ForeignKey('BudgetCategory', blank=True, null=True) - - def __unicode__(self): - return self.name - -class BudgetItem(models.Model): - code = models.CharField(max_length=10) - name = models.CharField(max_length=200) - parent = models.ForeignKey(BudgetCategory) - funds = models.FloatField() - - def __unicode__(self): - return self.name - -class Suggestion(models.Model): - user = models.ForeignKey(User) - item = models.ForeignKey(BudgetItem) - funds = models.FloatField() - - def __unicode__(self): - return self.user + " : " + self.item - -class Comment(models.Model): - user = models.ForeignKey(User) - item = models.ForeignKey(BudgetItem) - date = models.DateTimeField(auto_now=True) - comment =models.TextField() - attachment = models.FileField(upload_to="uploaded/%Y/%m/%d/") - - def __unicode__(self): - return self.user + " : " + self.item + " @ " + self.date - -admin.site.register(Budget) -admin.site.register(BudgetCategory) -admin.site.register(BudgetItem) -admin.site.register(Suggestion) -admin.site.register(Comment) diff --git a/server/fjarlog/views.py b/server/fjarlog/views.py deleted file mode 100644 index 60f00ef..0000000 --- a/server/fjarlog/views.py +++ /dev/null @@ -1 +0,0 @@ -# Create your views here. diff --git a/server/inventory/models.py b/server/inventory/models.py index 71a8362..75e89ab 100644 --- a/server/inventory/models.py +++ b/server/inventory/models.py @@ -1,3 +1,19 @@ from django.db import models +from sites.models import * +from objects.models import * +from django.contrib import admin -# Create your models here. +class Inventory(models.Model): + name = models.CharField(max_length=100) + description = models.TextField() + site = models.ForeignKey(Site) + objects = models.ManyToManyField(InventoryObject) + +class InventoryObject(models.Model): + object = models.ForeignKey(Object) + notes = models.TextField() + quantity = models.IntegerField() + unitprice = models.FloatField() + + +admin.site.register(Inventory) diff --git a/server/orders/models.py b/server/orders/models.py index f375f8d..43b2b40 100644 --- a/server/orders/models.py +++ b/server/orders/models.py @@ -19,7 +19,7 @@ class Address(models.Model): class Order(models.Model): customer = models.ForeignKey(User) - object = models.ForeignKey(Object) + objects = models.ManyToManyField(Object) site = models.ForeignKey(Site, blank=True) # TODO: Add geo db # region = models.ForeignKey(Region, blank=True) diff --git a/server/sources.sql b/server/sources.sql deleted file mode 100644 index fb12998..0000000 --- a/server/sources.sql +++ /dev/null @@ -1,621 +0,0 @@ --- MySQL dump 10.11 --- --- Host: localhost Database: sources --- ------------------------------------------------------ --- Server version 5.0.51a-24+lenny1 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `auth_group` --- - -DROP TABLE IF EXISTS `auth_group`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `auth_group` ( - `id` int(11) NOT NULL auto_increment, - `name` varchar(80) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `name` (`name`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `auth_group` --- - -LOCK TABLES `auth_group` WRITE; -/*!40000 ALTER TABLE `auth_group` DISABLE KEYS */; -/*!40000 ALTER TABLE `auth_group` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `auth_group_permissions` --- - -DROP TABLE IF EXISTS `auth_group_permissions`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `auth_group_permissions` ( - `id` int(11) NOT NULL auto_increment, - `group_id` int(11) NOT NULL, - `permission_id` int(11) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `group_id` (`group_id`,`permission_id`), - KEY `permission_id_refs_id_5886d21f` (`permission_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `auth_group_permissions` --- - -LOCK TABLES `auth_group_permissions` WRITE; -/*!40000 ALTER TABLE `auth_group_permissions` DISABLE KEYS */; -/*!40000 ALTER TABLE `auth_group_permissions` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `auth_message` --- - -DROP TABLE IF EXISTS `auth_message`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `auth_message` ( - `id` int(11) NOT NULL auto_increment, - `user_id` int(11) NOT NULL, - `message` longtext NOT NULL, - PRIMARY KEY (`id`), - KEY `auth_message_user_id` (`user_id`) -) ENGINE=MyISAM AUTO_INCREMENT=21 DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `auth_message` --- - -LOCK TABLES `auth_message` WRITE; -/*!40000 ALTER TABLE `auth_message` DISABLE KEYS */; -/*!40000 ALTER TABLE `auth_message` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `auth_permission` --- - -DROP TABLE IF EXISTS `auth_permission`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `auth_permission` ( - `id` int(11) NOT NULL auto_increment, - `name` varchar(50) NOT NULL, - `content_type_id` int(11) NOT NULL, - `codename` varchar(100) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `content_type_id` (`content_type_id`,`codename`), - KEY `auth_permission_content_type_id` (`content_type_id`) -) ENGINE=MyISAM AUTO_INCREMENT=61 DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `auth_permission` --- - -LOCK TABLES `auth_permission` WRITE; -/*!40000 ALTER TABLE `auth_permission` DISABLE KEYS */; -INSERT INTO `auth_permission` VALUES (1,'Can add permission',1,'add_permission'),(2,'Can change permission',1,'change_permission'),(3,'Can delete permission',1,'delete_permission'),(4,'Can add group',2,'add_group'),(5,'Can change group',2,'change_group'),(6,'Can delete group',2,'delete_group'),(7,'Can add user',3,'add_user'),(8,'Can change user',3,'change_user'),(9,'Can delete user',3,'delete_user'),(10,'Can add message',4,'add_message'),(11,'Can change message',4,'change_message'),(12,'Can delete message',4,'delete_message'),(13,'Can add log entry',5,'add_logentry'),(14,'Can change log entry',5,'change_logentry'),(15,'Can delete log entry',5,'delete_logentry'),(16,'Can add content type',6,'add_contenttype'),(17,'Can change content type',6,'change_contenttype'),(18,'Can delete content type',6,'delete_contenttype'),(19,'Can add session',7,'add_session'),(20,'Can change session',7,'change_session'),(21,'Can delete session',7,'delete_session'),(22,'Can add site',8,'add_site'),(23,'Can change site',8,'change_site'),(24,'Can delete site',8,'delete_site'),(25,'Can add budget',9,'add_budget'),(26,'Can change budget',9,'change_budget'),(27,'Can delete budget',9,'delete_budget'),(28,'Can add budget category',10,'add_budgetcategory'),(29,'Can change budget category',10,'change_budgetcategory'),(30,'Can delete budget category',10,'delete_budgetcategory'),(31,'Can add budget item',11,'add_budgetitem'),(32,'Can change budget item',11,'change_budgetitem'),(33,'Can delete budget item',11,'delete_budgetitem'),(49,'Can add equipment type',17,'add_equipmenttype'),(48,'Can delete access model',16,'delete_accessmodel'),(46,'Can add access model',16,'add_accessmodel'),(47,'Can change access model',16,'change_accessmodel'),(40,'Can add suggestion',14,'add_suggestion'),(41,'Can change suggestion',14,'change_suggestion'),(42,'Can delete suggestion',14,'delete_suggestion'),(43,'Can add comment',15,'add_comment'),(44,'Can change comment',15,'change_comment'),(45,'Can delete comment',15,'delete_comment'),(50,'Can change equipment type',17,'change_equipmenttype'),(51,'Can delete equipment type',17,'delete_equipmenttype'),(52,'Can add site',18,'add_site'),(53,'Can change site',18,'change_site'),(54,'Can delete site',18,'delete_site'),(55,'Can add equipment',19,'add_equipment'),(56,'Can change equipment',19,'change_equipment'),(57,'Can delete equipment',19,'delete_equipment'),(58,'Can add equipment capability',20,'add_equipmentcapability'),(59,'Can change equipment capability',20,'change_equipmentcapability'),(60,'Can delete equipment capability',20,'delete_equipmentcapability'); -/*!40000 ALTER TABLE `auth_permission` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `auth_user` --- - -DROP TABLE IF EXISTS `auth_user`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `auth_user` ( - `id` int(11) NOT NULL auto_increment, - `username` varchar(30) NOT NULL, - `first_name` varchar(30) NOT NULL, - `last_name` varchar(30) NOT NULL, - `email` varchar(75) NOT NULL, - `password` varchar(128) NOT NULL, - `is_staff` tinyint(1) NOT NULL, - `is_active` tinyint(1) NOT NULL, - `is_superuser` tinyint(1) NOT NULL, - `last_login` datetime NOT NULL, - `date_joined` datetime NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `username` (`username`) -) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `auth_user` --- - -LOCK TABLES `auth_user` WRITE; -/*!40000 ALTER TABLE `auth_user` DISABLE KEYS */; -INSERT INTO `auth_user` VALUES (1,'smari','','','smari@anarchism.is','sha1$56e2e$89ac92e6c0ac4d7058567786a49620c0f64c7c52',1,1,1,'2009-06-24 12:41:34','2009-06-24 12:41:08'); -/*!40000 ALTER TABLE `auth_user` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `auth_user_groups` --- - -DROP TABLE IF EXISTS `auth_user_groups`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `auth_user_groups` ( - `id` int(11) NOT NULL auto_increment, - `user_id` int(11) NOT NULL, - `group_id` int(11) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `user_id` (`user_id`,`group_id`), - KEY `group_id_refs_id_f116770` (`group_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `auth_user_groups` --- - -LOCK TABLES `auth_user_groups` WRITE; -/*!40000 ALTER TABLE `auth_user_groups` DISABLE KEYS */; -/*!40000 ALTER TABLE `auth_user_groups` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `auth_user_user_permissions` --- - -DROP TABLE IF EXISTS `auth_user_user_permissions`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `auth_user_user_permissions` ( - `id` int(11) NOT NULL auto_increment, - `user_id` int(11) NOT NULL, - `permission_id` int(11) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `user_id` (`user_id`,`permission_id`), - KEY `permission_id_refs_id_67e79cb` (`permission_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `auth_user_user_permissions` --- - -LOCK TABLES `auth_user_user_permissions` WRITE; -/*!40000 ALTER TABLE `auth_user_user_permissions` DISABLE KEYS */; -/*!40000 ALTER TABLE `auth_user_user_permissions` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `django_admin_log` --- - -DROP TABLE IF EXISTS `django_admin_log`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `django_admin_log` ( - `id` int(11) NOT NULL auto_increment, - `action_time` datetime NOT NULL, - `user_id` int(11) NOT NULL, - `content_type_id` int(11) default NULL, - `object_id` longtext, - `object_repr` varchar(200) NOT NULL, - `action_flag` smallint(5) unsigned NOT NULL, - `change_message` longtext NOT NULL, - PRIMARY KEY (`id`), - KEY `django_admin_log_user_id` (`user_id`), - KEY `django_admin_log_content_type_id` (`content_type_id`) -) ENGINE=MyISAM AUTO_INCREMENT=21 DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `django_admin_log` --- - -LOCK TABLES `django_admin_log` WRITE; -/*!40000 ALTER TABLE `django_admin_log` DISABLE KEYS */; -INSERT INTO `django_admin_log` VALUES (1,'2009-06-24 12:41:45',1,9,'1','Fjárlög Íslenska ríkisins 2009',1,''),(2,'2009-06-24 12:42:05',1,10,'1','Æðsta stjórn ríkisins',2,'Changed name and parent.'),(3,'2009-06-27 00:01:04',1,16,'1','Commercial',1,''),(4,'2009-06-27 00:01:44',1,16,'2','Open Access',1,''),(5,'2009-06-27 00:02:50',1,16,'3','Fab Lab charter model',1,''),(6,'2009-06-27 00:07:48',1,20,'1','Laser cutter',1,''),(7,'2009-06-27 00:07:59',1,20,'2','3D mill',1,''),(8,'2009-06-27 00:08:07',1,20,'3','pick\'n\'place',1,''),(9,'2009-06-27 00:08:29',1,20,'4','Fuse Deposition Modeling (FDM)',1,''),(10,'2009-06-27 00:08:40',1,20,'5','Stereolithography (SLA)',1,''),(11,'2009-06-27 00:08:55',1,20,'6','Knitting',1,''),(12,'2009-06-27 00:09:16',1,20,'7','Lathe',1,''),(13,'2009-06-27 00:09:44',1,20,'8','Vinil cutter',1,''),(14,'2009-06-27 00:09:49',1,20,'9','Laser printer',1,''),(15,'2009-06-27 00:09:54',1,20,'10','Inkjet printer',1,''),(16,'2009-06-27 00:10:02',1,20,'11','Computer',1,''),(17,'2009-06-27 00:13:33',1,17,'1','Epilog Mini 24x12',1,''),(18,'2009-06-27 00:14:07',1,17,'2','Shopbot Tools Shopbot PRS Alpha',1,''),(19,'2009-06-27 00:14:26',1,17,'3','Roland Modela MDX-20',1,''),(20,'2009-06-27 00:15:09',1,17,'4','Roland CAMM-1',1,''); -/*!40000 ALTER TABLE `django_admin_log` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `django_content_type` --- - -DROP TABLE IF EXISTS `django_content_type`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `django_content_type` ( - `id` int(11) NOT NULL auto_increment, - `name` varchar(100) NOT NULL, - `app_label` varchar(100) NOT NULL, - `model` varchar(100) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `app_label` (`app_label`,`model`) -) ENGINE=MyISAM AUTO_INCREMENT=21 DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `django_content_type` --- - -LOCK TABLES `django_content_type` WRITE; -/*!40000 ALTER TABLE `django_content_type` DISABLE KEYS */; -INSERT INTO `django_content_type` VALUES (1,'permission','auth','permission'),(2,'group','auth','group'),(3,'user','auth','user'),(4,'message','auth','message'),(5,'log entry','admin','logentry'),(6,'content type','contenttypes','contenttype'),(7,'session','sessions','session'),(8,'site','sites','site'),(9,'budget','fjarlog','budget'),(10,'budget category','fjarlog','budgetcategory'),(11,'budget item','fjarlog','budgetitem'),(16,'access model','fabmap','accessmodel'),(14,'suggestion','fjarlog','suggestion'),(15,'comment','fjarlog','comment'),(17,'equipment type','fabmap','equipmenttype'),(18,'site','fabmap','site'),(19,'equipment','fabmap','equipment'),(20,'equipment capability','fabmap','equipmentcapability'); -/*!40000 ALTER TABLE `django_content_type` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `django_session` --- - -DROP TABLE IF EXISTS `django_session`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `django_session` ( - `session_key` varchar(40) NOT NULL, - `session_data` longtext NOT NULL, - `expire_date` datetime NOT NULL, - PRIMARY KEY (`session_key`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `django_session` --- - -LOCK TABLES `django_session` WRITE; -/*!40000 ALTER TABLE `django_session` DISABLE KEYS */; -INSERT INTO `django_session` VALUES ('a915e8307ad233bbdd69749e09c88dc4','gAJ9cQEoVRJfYXV0aF91c2VyX2JhY2tlbmRxAlUpZGphbmdvLmNvbnRyaWIuYXV0aC5iYWNrZW5k\ncy5Nb2RlbEJhY2tlbmRxA1UNX2F1dGhfdXNlcl9pZHEEigEBdS40OGQ3NTdiMmI5YWQyMzMzMzkw\nMGQ3MDc3ZTcwNTE3OA==\n','2009-07-08 12:41:34'); -/*!40000 ALTER TABLE `django_session` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `django_site` --- - -DROP TABLE IF EXISTS `django_site`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `django_site` ( - `id` int(11) NOT NULL auto_increment, - `domain` varchar(100) NOT NULL, - `name` varchar(50) NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `django_site` --- - -LOCK TABLES `django_site` WRITE; -/*!40000 ALTER TABLE `django_site` DISABLE KEYS */; -INSERT INTO `django_site` VALUES (1,'example.com','example.com'); -/*!40000 ALTER TABLE `django_site` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `fabmap_accessmodel` --- - -DROP TABLE IF EXISTS `fabmap_accessmodel`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `fabmap_accessmodel` ( - `id` int(11) NOT NULL auto_increment, - `name` varchar(200) NOT NULL, - `description` longtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `fabmap_accessmodel` --- - -LOCK TABLES `fabmap_accessmodel` WRITE; -/*!40000 ALTER TABLE `fabmap_accessmodel` DISABLE KEYS */; -INSERT INTO `fabmap_accessmodel` VALUES (1,'Commercial','Pay for access to equipment'),(2,'Open Access','Free access to equipment, will frequently accept donations or require participation to some degree.'),(3,'Fab Lab charter model','Similar to Open Access models, but are guided by a the following charter:\r\n\r\nThe Fab Charter\r\n\r\n\r\nMission: fab labs are a global network of local labs, enabling invention by providing access for individuals to tools for digital fabrication.\r\n\r\nAccess: you can use the fab lab to make almost anything (that doesn\'t hurt anyone); you must learn to do it yourself, and you must share use of the lab with other uses and users\r\n\r\nEducation: training in the fab lab is based on doing projects and learning from peers; you\'re expected to contribute to documentation and instruction\r\n\r\nResponsibility: you\'re responsible for:\r\n\r\nsafety: knowing how to work without hurting people or machines\r\ncleaning up: leaving the lab cleaner than you found it\r\noperations: assisting with maintaining, repairing, and reporting on tools, supplies, and incidents\r\n\r\nSecrecy: designs and processes developed in fab labs must remain available for individual use although intellectual property can be protected however you choose\r\n\r\nBusiness: commercial activities can be incubated in fab labs but they must not conflict with open access, they should grow beyond rather than within the lab, and they are expected to benefit the inventors, labs, and networks that contribute to their success.\r\n'); -/*!40000 ALTER TABLE `fabmap_accessmodel` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `fabmap_equipment` --- - -DROP TABLE IF EXISTS `fabmap_equipment`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `fabmap_equipment` ( - `id` int(11) NOT NULL auto_increment, - `type_id` int(11) NOT NULL, - `site_id` int(11) NOT NULL, - `notes` longtext NOT NULL, - PRIMARY KEY (`id`), - KEY `fabmap_equipment_type_id` (`type_id`), - KEY `fabmap_equipment_site_id` (`site_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `fabmap_equipment` --- - -LOCK TABLES `fabmap_equipment` WRITE; -/*!40000 ALTER TABLE `fabmap_equipment` DISABLE KEYS */; -/*!40000 ALTER TABLE `fabmap_equipment` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `fabmap_equipmentcapability` --- - -DROP TABLE IF EXISTS `fabmap_equipmentcapability`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `fabmap_equipmentcapability` ( - `id` int(11) NOT NULL auto_increment, - `name` varchar(200) NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `fabmap_equipmentcapability` --- - -LOCK TABLES `fabmap_equipmentcapability` WRITE; -/*!40000 ALTER TABLE `fabmap_equipmentcapability` DISABLE KEYS */; -INSERT INTO `fabmap_equipmentcapability` VALUES (1,'Laser cutter'),(2,'3D mill'),(3,'pick\'n\'place'),(4,'Fuse Deposition Modeling (FDM)'),(5,'Stereolithography (SLA)'),(6,'Knitting'),(7,'Lathe'),(8,'Vinil cutter'),(9,'Laser printer'),(10,'Inkjet printer'),(11,'Computer'); -/*!40000 ALTER TABLE `fabmap_equipmentcapability` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `fabmap_equipmenttype` --- - -DROP TABLE IF EXISTS `fabmap_equipmenttype`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `fabmap_equipmenttype` ( - `id` int(11) NOT NULL auto_increment, - `name` varchar(200) NOT NULL, - `maker` varchar(200) NOT NULL, - `website` varchar(200) NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `fabmap_equipmenttype` --- - -LOCK TABLES `fabmap_equipmenttype` WRITE; -/*!40000 ALTER TABLE `fabmap_equipmenttype` DISABLE KEYS */; -INSERT INTO `fabmap_equipmenttype` VALUES (1,'Mini 24x12','Epilog','http://www.epiloglaser.com/'),(2,'Shopbot PRS Alpha','Shopbot Tools','http://www.shopbottools.com/'),(3,'Modela MDX-20','Roland',''),(4,'CAMM-1','Roland',''); -/*!40000 ALTER TABLE `fabmap_equipmenttype` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `fabmap_equipmenttype_capabilities` --- - -DROP TABLE IF EXISTS `fabmap_equipmenttype_capabilities`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `fabmap_equipmenttype_capabilities` ( - `id` int(11) NOT NULL auto_increment, - `equipmenttype_id` int(11) NOT NULL, - `equipmentcapability_id` int(11) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `equipmenttype_id` (`equipmenttype_id`,`equipmentcapability_id`), - KEY `equipmentcapability_id_refs_id_45ca1995` (`equipmentcapability_id`) -) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `fabmap_equipmenttype_capabilities` --- - -LOCK TABLES `fabmap_equipmenttype_capabilities` WRITE; -/*!40000 ALTER TABLE `fabmap_equipmenttype_capabilities` DISABLE KEYS */; -INSERT INTO `fabmap_equipmenttype_capabilities` VALUES (1,1,1),(2,2,2),(3,3,2),(4,4,8); -/*!40000 ALTER TABLE `fabmap_equipmenttype_capabilities` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `fabmap_site` --- - -DROP TABLE IF EXISTS `fabmap_site`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `fabmap_site` ( - `id` int(11) NOT NULL auto_increment, - `lat` double NOT NULL, - `lon` double NOT NULL, - `name` varchar(200) NOT NULL, - `locname` varchar(200) NOT NULL, - `website` varchar(200) NOT NULL, - `manager_id` int(11) NOT NULL, - `access_id` int(11) NOT NULL, - PRIMARY KEY (`id`), - KEY `fabmap_site_manager_id` (`manager_id`), - KEY `fabmap_site_access_id` (`access_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `fabmap_site` --- - -LOCK TABLES `fabmap_site` WRITE; -/*!40000 ALTER TABLE `fabmap_site` DISABLE KEYS */; -/*!40000 ALTER TABLE `fabmap_site` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `fjarlog_budget` --- - -DROP TABLE IF EXISTS `fjarlog_budget`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `fjarlog_budget` ( - `id` int(11) NOT NULL auto_increment, - `name` varchar(200) NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `fjarlog_budget` --- - -LOCK TABLES `fjarlog_budget` WRITE; -/*!40000 ALTER TABLE `fjarlog_budget` DISABLE KEYS */; -INSERT INTO `fjarlog_budget` VALUES (1,'Fjárlög Íslenska ríkisins 2009'); -/*!40000 ALTER TABLE `fjarlog_budget` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `fjarlog_budgetcategory` --- - -DROP TABLE IF EXISTS `fjarlog_budgetcategory`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `fjarlog_budgetcategory` ( - `id` int(11) NOT NULL auto_increment, - `budget_id` int(11) NOT NULL, - `code` varchar(10) NOT NULL, - `name` varchar(200) NOT NULL, - `parent_id` int(11) default NULL, - PRIMARY KEY (`id`), - KEY `fjarlog_budgetcategory_budget_id` (`budget_id`), - KEY `fjarlog_budgetcategory_parent_id` (`parent_id`) -) ENGINE=MyISAM AUTO_INCREMENT=15 DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `fjarlog_budgetcategory` --- - -LOCK TABLES `fjarlog_budgetcategory` WRITE; -/*!40000 ALTER TABLE `fjarlog_budgetcategory` DISABLE KEYS */; -INSERT INTO `fjarlog_budgetcategory` VALUES (1,1,'00','Æðsta stjórn ríkisins',NULL),(2,1,'01','Forsætisráðuneyti',NULL),(3,1,'02','Menntamálaráðuneyti',NULL),(4,1,'03','Utanríkisráðuneyti',NULL),(5,1,'04','Sjávarútvegs- og landbúnaðarráðuneyti',NULL),(6,1,'06','Dóms- og kirkjumálaráðuneyti',NULL),(7,1,'07','Félags- og tryggingamálaráðuneyti',NULL),(8,1,'08','Heilbrigðisráðuneyti',NULL),(9,1,'09','Fjármálaráðuneyti',NULL),(10,1,'10','Samgönguráðuneyti',NULL),(11,1,'11','Iðnaðarráðuneyti',NULL),(12,1,'12','Viðskiptaráðuneyti',NULL),(13,1,'14','Umhverfisráðuneyti',NULL),(14,1,'19','Vaxtagjöld ríkissjóðs',NULL); -/*!40000 ALTER TABLE `fjarlog_budgetcategory` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `fjarlog_budgetitem` --- - -DROP TABLE IF EXISTS `fjarlog_budgetitem`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `fjarlog_budgetitem` ( - `id` int(11) NOT NULL auto_increment, - `code` varchar(10) NOT NULL, - `name` varchar(200) NOT NULL, - `parent_id` int(11) NOT NULL, - `funds` double NOT NULL, - PRIMARY KEY (`id`), - KEY `fjarlog_budgetitem_parent_id` (`parent_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `fjarlog_budgetitem` --- - -LOCK TABLES `fjarlog_budgetitem` WRITE; -/*!40000 ALTER TABLE `fjarlog_budgetitem` DISABLE KEYS */; -/*!40000 ALTER TABLE `fjarlog_budgetitem` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `fjarlog_comment` --- - -DROP TABLE IF EXISTS `fjarlog_comment`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `fjarlog_comment` ( - `id` int(11) NOT NULL auto_increment, - `user_id` int(11) NOT NULL, - `item_id` int(11) NOT NULL, - `date` datetime NOT NULL, - `comment` longtext NOT NULL, - `attachment` varchar(100) NOT NULL, - PRIMARY KEY (`id`), - KEY `fjarlog_comment_user_id` (`user_id`), - KEY `fjarlog_comment_item_id` (`item_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `fjarlog_comment` --- - -LOCK TABLES `fjarlog_comment` WRITE; -/*!40000 ALTER TABLE `fjarlog_comment` DISABLE KEYS */; -/*!40000 ALTER TABLE `fjarlog_comment` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `fjarlog_suggestion` --- - -DROP TABLE IF EXISTS `fjarlog_suggestion`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `fjarlog_suggestion` ( - `id` int(11) NOT NULL auto_increment, - `user_id` int(11) NOT NULL, - `item_id` int(11) NOT NULL, - `funds` double NOT NULL, - PRIMARY KEY (`id`), - KEY `fjarlog_suggestion_user_id` (`user_id`), - KEY `fjarlog_suggestion_item_id` (`item_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - --- --- Dumping data for table `fjarlog_suggestion` --- - -LOCK TABLES `fjarlog_suggestion` WRITE; -/*!40000 ALTER TABLE `fjarlog_suggestion` DISABLE KEYS */; -/*!40000 ALTER TABLE `fjarlog_suggestion` ENABLE KEYS */; -UNLOCK TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2009-06-28 16:20:49 diff --git a/server/temp/undirflokkarsorted.csv b/server/temp/undirflokkarsorted.csv deleted file mode 100644 index 04196e3..0000000 --- a/server/temp/undirflokkarsorted.csv +++ /dev/null @@ -1,465 +0,0 @@ -00,101,Embætti forseta Íslands -00,201,Alþingi -00,205,Framkvæmdir á Alþingisreit -00,207,Rannsókn á falli íslensku bankanna á árinu 2008 -00,301,Ríkisstjórn -00,401,Hæstiréttur -00,610,Umboðsmaður Alþingis -00,620,Ríkisendurskoðun -01,101,Forsætisráðuneyti, aðalskrifstofa -01,190,Ýmis verkefni -01,199,Ráðstöfunarfé -01,201,Fasteignir forsætisráðuneytis -01,203,Fasteignir Stjórnarráðsins -01,231,Norræna ráðherranefndin -01,241,Umboðsmaður barna -01,251,Þjóðmenningarhúsið -01,253,Vest-norrænt menningarhús í Kaupmannahöfn -01,255,Gljúfrasteinn - Hús skáldsins -01,261,Óbyggðanefnd -01,271,Ríkislögmaður -01,401,Hagstofa Íslands -01,902,Þjóðgarðurinn á Þingvöllum -01,996,Íslenska upplýsingasamfélagið, sameiginleg verkefni ráðuneyta -02,101,Menntamálaráðuneyti, aðalskrifstofa -02,199,Ráðstöfunarfé -02,201,Háskóli Íslands -02,202,Tilraunastöð Háskólans að Keldum -02,203,Raunvísindastofnun Háskólans -02,209,Stofnun Árna Magnússonar í íslenskum fræðum -02,210,Háskólinn á Akureyri -02,216,Landbúnaðarháskóli Íslands -02,217,Hólaskóli - Háskólinn á Hólum -02,223,Námsmatsstofnun -02,225,Háskólinn á Bifröst -02,227,Háskólinn í Reykjavík -02,228,Listaháskóli Íslands -02,231,Rannsóknamiðstöð Íslands -02,234,Ritlauna- og rannsóknasjóður prófessora -02,235,Markáætlun á sviði vísinda og tækni -02,236,Rannsóknasjóður -02,238,Tækjasjóður -02,239,Rannsóknarnámssjóður -02,269,Háskóla- og vísindastofnanir, viðhald og stofnkostnaður -02,299,Háskóla- og rannsóknastarfsemi -02,301,Menntaskólinn í Reykjavík -02,302,Menntaskólinn á Akureyri -02,303,Menntaskólinn að Laugarvatni -02,304,Menntaskólinn við Hamrahlíð -02,305,Menntaskólinn við Sund -02,306,Menntaskólinn á Ísafirði -02,307,Menntaskólinn á Egilsstöðum -02,308,Menntaskólinn í Kópavogi -02,309,Kvennaskólinn í Reykjavík -02,316,Fasteignir framhaldsskóla -02,318,Framhaldsskólar, stofnkostnaður -02,319,Framhaldsskólar, almennt -02,350,Fjölbrautaskólinn í Breiðholti -02,351,Fjölbrautaskólinn Ármúla -02,352,Flensborgarskóli -02,353,Fjölbrautaskóli Suðurnesja -02,354,Fjölbrautaskóli Vesturlands -02,355,Framhaldsskólinn í Vestmannaeyjum -02,356,Fjölbrautaskóli Norðurlands vestra -02,357,Fjölbrautaskóli Suðurlands -02,358,Verkmenntaskóli Austurlands -02,359,Verkmenntaskólinn á Akureyri -02,360,Fjölbrautaskólinn í Garðabæ -02,361,Framhaldsskólinn í A-Skaftafellssýslu -02,362,Framhaldsskólinn á Húsavík -02,363,Framhaldsskólinn á Laugum -02,365,Borgarholtsskóli -02,367,Fjölbrautaskóli Snæfellinga -02,368,Menntaskóli Borgarfjarðar -02,369,Menntaskólinn Hraðbraut -02,370,Framhaldsskólinn í Mosfellsbæ -02,372,Framhaldsskóli við utanverðan Eyjafjörð -02,430,Samskiptamiðstöð heyrnarlausra og heyrnarskertra -02,441,Fullorðinsfræðsla fatlaðra -02,451,Símenntun og fjarkennsla -02,504,Tækniskólinn -02,516,Iðnskólinn í Hafnarfirði -02,541,Hússtjórnarskólinn í Reykjavík -02,551,Hússtjórnarskólinn Hallormsstað -02,581,Verslunarskóli Íslands -02,720,Grunnskólar, almennt -02,725,Námsgagnastofnun -02,872,Lánasjóður íslenskra námsmanna -02,884,Jöfnun á námskostnaði -02,901,Fornleifavernd ríkisins -02,902,Þjóðminjasafn Íslands -02,903,Þjóðskjalasafn Íslands -02,905,Landsbókasafn Íslands - Háskólabókasafn -02,906,Listasafn Einars Jónssonar -02,907,Listasafn Íslands -02,908,Kvikmyndasafn Íslands -02,909,Blindrabókasafn Íslands -02,911,Náttúruminjasafn Íslands -02,918,Safnasjóður -02,919,Söfn, ýmis framlög -02,965,Tónlistar- og ráðstefnuhús í Reykjavík -02,969,Menningarstofnanir, viðhald og stofnkostnaður -02,971,Ríkisútvarpið -02,972,Íslenski dansflokkurinn -02,973,Þjóðleikhúsið -02,974,Sinfóníuhljómsveit Íslands -02,977,Höfundarréttargjöld -02,978,Listasjóðir -02,979,Húsafriðunarnefnd -02,980,Listskreytingasjóður -02,981,Kvikmyndamiðstöð Íslands -02,982,Listir, framlög -02,983,Ýmis fræðistörf -02,984,Norræn samvinna -02,985,Rammaáætlanir ESB um menntun, rannsóknir og tækniþróun -02,988,Æskulýðsmál -02,989,Ýmis íþróttamál -02,999,Ýmislegt -03,101,Utanríkisráðuneyti, aðalskrifstofa -03,111,Þýðingamiðstöð utanríkisráðuneytis -03,190,Ýmis verkefni -03,199,Ráðstöfunarfé -03,214,Varnarmálastofnun -03,300,Sendiráð Íslands -03,390,Þróunarsamvinnustofnun Íslands -03,391,Þróunarmál og alþjóðleg hjálparstarfsemi -03,401,Alþjóðastofnanir -03,611,Útflutningsráð Íslands -04,101,Sjávarútvegs- og landbúnaðarráðuneyti, aðalskrifstofa -04,190,Ýmis verkefni -04,199,Ráðstöfunarfé -04,215,Fiskistofa -04,217,Verðlagsstofa skiptaverðs -04,234,Matvælastofnun -04,331,Héraðs- og Austurlandsskógar -04,332,Suðurlandsskógar -04,334,Vesturlandsskógar -04,335,Skjólskógar á Vestfjörðum -04,336,Norðurlandsskógar -04,401,Hafrannsóknastofnunin -04,405,Veiðimálastofnun -04,411,Matvælarannsóknir -04,413,Verkefnasjóður sjávarútvegsins -04,415,Sjóður til síldarrannsókna -04,417,Rannsóknasjóður til að auka verðmæti sjávarfangs -04,421,Bygging rannsóknastofnana sjávarútvegsins -04,423,Skrifstofa rannsóknastofnana atvinnuveganna -04,481,Rannsóknir háskóla í þágu landbúnaðar -04,483,Landgræðsla og skógrækt í þágu landbúnaðar -04,487,Hagþjónusta landbúnaðarins -04,801,Greiðslur vegna mjólkurframleiðslu -04,805,Greiðslur vegna sauðfjárframleiðslu -04,807,Greiðslur vegna grænmetisframleiðslu -04,811,Bændasamtök Íslands -04,818,Búnaðarsjóður -04,821,Framleiðnisjóður landbúnaðarins -04,827,Fóðursjóður -04,828,Garðávaxtasjóður -04,831,Jarðasjóður og Jarðeignir ríkisins -04,843,Fiskræktarsjóður -04,851,Greiðslur vegna riðuveiki -04,891,Sérstakar greiðslur í landbúnaði -06,101,Dóms- og kirkjumálaráðuneyti, aðalskrifstofa -06,102,Stjórnartíðindi -06,103,Lagasafn -06,106,Þjóðskrá -06,111,Kosningar -06,190,Ýmis verkefni -06,199,Ráðstöfunarfé -06,201,Hæstiréttur -06,210,Héraðsdómstólar -06,231,Málskostnaður í opinberum málum -06,232,Opinber réttaraðstoð -06,235,Bætur brotaþola -06,251,Persónuvernd -06,300,Héraðssaksóknari -06,301,Ríkissaksóknari -06,303,Ríkislögreglustjóri -06,305,Lögregluskóli ríkisins -06,309,Sérstakur saksóknari samkvæmt lögum nr. 135/2008 -06,310,Lögreglustjórinn á höfuðborgarsvæðinu -06,312,Lögreglustjórinn á Suðurnesjum -06,325,Samræmd neyðarsvörun -06,341,Áfengis- og fíkniefnamál -06,390,Ýmis löggæslu- og öryggismál -06,391,Húsnæði löggæslustofnana -06,395,Landhelgisgæsla Íslands -06,396,Landhelgissjóður Íslands -06,397,Schengen-samstarf -06,398,Útlendingastofnun -06,411,Sýslumaðurinn í Reykjavík -06,412,Sýslumaðurinn á Akranesi -06,413,Sýslumaðurinn í Borgarnesi -06,414,Sýslumaður Snæfellinga -06,415,Sýslumaðurinn í Búðardal -06,416,Sýslumaðurinn á Patreksfirði -06,417,Sýslumaðurinn í Bolungarvík -06,418,Sýslumaðurinn á Ísafirði -06,419,Sýslumaðurinn á Hólmavík -06,420,Sýslumaðurinn á Blönduósi -06,421,Sýslumaðurinn á Sauðárkróki -06,422,Sýslumaðurinn á Siglufirði -06,424,Sýslumaðurinn á Akureyri -06,425,Sýslumaðurinn á Húsavík -06,426,Sýslumaðurinn á Seyðisfirði -06,428,Sýslumaðurinn á Eskifirði -06,429,Sýslumaðurinn á Höfn í Hornafirði -06,430,Sýslumaðurinn í Vík í Mýrdal -06,431,Sýslumaðurinn á Hvolsvelli -06,432,Sýslumaðurinn í Vestmannaeyjum -06,433,Sýslumaðurinn á Selfossi -06,434,Sýslumaðurinn í Reykjanesbæ -06,436,Sýslumaðurinn í Hafnarfirði -06,437,Sýslumaðurinn í Kópavogi -06,490,Ýmis rekstrarkostnaður sýslumannsembætta -06,491,Húsnæði og búnaður sýslumanna -06,501,Fangelsismálastofnun ríkisins -06,591,Fangelsisbyggingar -06,701,Þjóðkirkjan -06,705,Kirkjumálasjóður -06,707,Kristnisjóður -06,733,Kirkjugarðar -06,735,Sóknargjöld -06,736,Jöfnunarsjóður sókna -07,101,Félags- og tryggingamálaráðuneyti, aðalskrifstofa -07,190,Ýmis verkefni -07,199,Ráðstöfunarfé -07,205,Leiguíbúðir -07,207,Varasjóður húsnæðismála -07,302,Ríkissáttasemjari -07,313,Jafnréttisstofa -07,331,Vinnueftirlit ríkisins -07,400,Barnaverndarstofa -07,505,Öldrunarstofnanir, almennt -07,515,Framkvæmdasjóður aldraðra -07,700,Málefni fatlaðra -07,701,Málefni fatlaðra, Reykjavík -07,702,Málefni fatlaðra, Reykjanesi -07,703,Málefni fatlaðra, Vesturlandi -07,704,Málefni fatlaðra, Vestfjörðum -07,705,Málefni fatlaðra, Norðurlandi vestra -07,706,Málefni fatlaðra, Norðurlandi eystra -07,707,Málefni fatlaðra, Austurlandi -07,708,Málefni fatlaðra, Suðurlandi -07,711,Styrktarfélag vangefinna -07,720,Skálatúnsheimilið, Mosfellsbæ -07,722,Sólheimar í Grímsnesi -07,750,Greiningar- og ráðgjafarstöð ríkisins -07,755,Þjónustu- og þekkingarmiðstöð fyrir blinda og sjónskerta -07,795,Framkvæmdasjóður fatlaðra -07,821,Tryggingastofnun ríkisins -07,825,Bætur samkvæmt lögum um félagslega aðstoð -07,827,Lífeyristryggingar -07,831,Eftirlaunasjóður aldraðra -07,980,Vinnumálastofnun -07,981,Vinnumál -07,982,Ábyrgðasjóður launa -07,983,Foreldrar langveikra eða alvarlega fatlaðra barna -07,984,Atvinnuleysistryggingasjóður -07,985,Félagsmálaskóli alþýðu -07,987,Tryggingasjóður sjálfstætt starfandi einstaklinga -07,989,Fæðingarorlof -07,999,Félagsmál, ýmis starfsemi -08,101,Heilbrigðisráðuneyti, aðalskrifstofa -08,199,Ráðstöfunarfé -08,202,Sjúkratryggingastofnun -08,206,Sjúkratryggingar -08,208,Slysatryggingar -08,209,Sjúklingatrygging -08,301,Landlæknir -08,305,Lýðheilsustöð -08,324,Heyrnar- og talmeinastöð Íslands -08,326,Sjónstöð Íslands -08,327,Geislavarnir ríkisins -08,340,Málefni fatlaðra -08,358,Sjúkrahúsið á Akureyri -08,373,Landspítali -08,376,Bygging hátæknisjúkrahúss á lóð Landspítalans -08,379,Sjúkrahús, óskipt -08,383,Sjúkrahótel -08,384,Rjóður, hvíldarheimili fyrir börn -08,386,Vistun ósakhæfra afbrotamanna -08,388,Samtök áhugamanna um áfengisvandamálið -08,397,Lyfjastofnun -08,399,Heilbrigðismál, ýmis starfsemi -08,401,Öldrunarstofnanir, almennt -08,405,Hrafnista, Reykjavík -08,406,Hrafnista, Hafnarfirði -08,407,Grund, Reykjavík -08,408,Sunnuhlíð, Kópavogi -08,409,Hjúkrunarheimilið Skjól -08,410,Hjúkrunarheimilið Eir -08,411,Garðvangur, Garði -08,412,Hjúkrunarheimilið Skógarbær -08,413,Hjúkrunarheimilið Droplaugarstöðum -08,414,Hjúkrunarheimilið Lundur, Hellu -08,415,Hjúkrunarheimilið Hulduhlíð, Eskifirði -08,416,Hjúkrunarheimilið Hornbrekka, Ólafsfirði -08,417,Hjúkrunarheimilið Naust, Þórshöfn -08,418,Seljahlíð, Reykjavík -08,421,Víðines -08,423,Höfði, Akranesi -08,424,Dvalarheimili aldraðra Borgarnesi -08,425,Dvalarheimili aldraðra Stykkishólmi -08,426,Fellaskjól, Grundarfirði -08,427,Jaðar, Ólafsvík -08,428,Fellsendi, Búðardal -08,429,Barmahlíð, Reykhólum -08,433,Dalbær, Dalvík -08,434,Samningur við Akureyrarbæ um öldrunarþjónustu -08,436,Uppsalir, Fáskrúðsfirði -08,437,Samningur við Sveitarfélagið Hornafjörð um öldrunarþjónustu -08,438,Klausturhólar, Kirkjubæjarklaustri -08,439,Hjallatún, Vík -08,440,Kumbaravogur, Stokkseyri -08,441,Ás/Ásbyrgi, Hveragerði -08,442,Hraunbúðir, Vestmannaeyjum -08,443,Holtsbúð, Garðabæ -08,444,Vífilsstaðir, Garðabæ -08,447,Sóltún, Reykjavík -08,460,Dvalarrými aldraðra, önnur -08,470,Vesturhlíð, Reykjavík -08,472,Hlíðabær, Reykjavík -08,473,Lindargata, Reykjavík -08,474,Dagvist og endurhæfingarstöð MS-sjúklinga -08,475,Múlabær, Reykjavík -08,476,Fríðuhús, Reykjavík -08,477,Dagvistun aldraðra, aðrar -08,478,Vistheimilið Bjarg -08,479,Hlaðgerðarkot -08,491,Reykjalundur, Mosfellsbæ -08,492,Heilsustofnun Náttúrulækningafélags Íslands -08,493,Sjálfsbjörg, hjúkrunar- og endurhæfingarstofnun -08,494,Hlein -08,500,Heilsugæslustöðvar, almennt -08,501,Sjúkraflutningar -08,506,Heilsugæsla á höfuðborgarsvæðinu -08,508,Miðstöð heimahjúkrunar á höfuðborgarsvæðinu -08,515,Heilsugæslustöðin Lágmúla í Reykjavík -08,517,Læknavaktin -08,553,Samningur við Akureyrarbæ um heilsugæslu -08,588,Heilsugæslustöðin í Salahverfi í Kópavogi -08,700,Heilbrigðisstofnanir -08,711,Heilbrigðisstofnunin Akranesi -08,716,Heilbrigðisstofnun Vesturlands -08,721,Heilbrigðisstofnunin Patreksfirði -08,726,Heilbrigðisstofnun Vestfjarða -08,735,Heilbrigðisstofnunin Hólmavík -08,741,Heilbrigðisstofnunin Hvammstanga -08,746,Heilbrigðisstofnunin Blönduósi og Sauðárkróki -08,756,Heilbrigðisstofnunin Dalvíkur- og Fjallabyggð -08,761,Heilbrigðisstofnun Þingeyinga -08,777,Heilbrigðisstofnun Austurlands -08,779,Heilbrigðisstofnun Suð-Austurlands -08,781,Heilbrigðisstofnunin Vestmannaeyjum -08,787,Heilbrigðisstofnun Suðurlands -08,791,Heilbrigðisstofnun Suðurnesja -08,795,St. Jósefsspítali, Sólvangur -09,101,Fjármálaráðuneyti, aðalskrifstofa -09,103,Fjársýsla ríkisins -09,199,Ráðstöfunarfé -09,201,Ríkisskattstjóri -09,202,Skattstofan í Reykjavík -09,203,Skattstofa Vesturlands -09,204,Skattstofa Vestfjarða -09,205,Skattstofa Norðurlands vestra -09,206,Skattstofa Norðurlands eystra -09,207,Skattstofa Austurlands -09,208,Skattstofa Suðurlands -09,209,Skattstofa Vestmannaeyja -09,211,Skattstofa Reykjaness -09,212,Skatta- og tollamál, ýmis útgjöld -09,214,Yfirskattanefnd -09,215,Skattrannsóknarstjóri ríkisins -09,250,Innheimtukostnaður -09,262,Tollstjórinn í Reykjavík -09,381,Lífeyrisskuldbindingar, eftirlaun -09,391,Jöfnun á örorkubyrði almennra lífeyrissjóða -09,393,Endurhæfingarsjóður -09,402,Fasteignaskrá Íslands -09,405,Fasteignagjöld af húsnæði ríkisins -09,481,Útgjöld samkvæmt heimildarákvæðum -09,711,Afskriftir skattkrafna -09,721,Fjármagnstekjuskattur -09,811,Barnabætur -09,821,Vaxtabætur -09,831,Uppbætur á eftirlaun lífeyrisþega -09,901,Framkvæmdasýsla ríkisins -09,905,Ríkiskaup -09,973,Tapaðar kröfur og tjónabætur -09,976,Lánaumsýsla ríkissjóðs -09,980,Rekstrarfélag stjórnarráðsbygginga við Arnarhól -09,981,Ýmsar fasteignir ríkissjóðs -09,984,Fasteignir ríkissjóðs -09,985,Fyrrum varnarsvæði við Keflavíkurflugvöll -09,989,Launa- og verðlagsmál -09,990,Ríkisstjórnarákvarðanir -09,991,Aðflutningsgjöld af útflutningi notaðra ökutækja -09,994,Virðisaukaskattur ríkisstofnana af tölvuvinnslu -09,999,Ýmislegt -10,101,Samgönguráðuneyti, aðalskrifstofa -10,190,Ýmis verkefni -10,199,Ráðstöfunarfé -10,211,Rekstur Vegagerðarinnar -10,212,Samgönguverkefni -10,251,Umferðarstofa -10,281,Rannsóknanefnd umferðarslysa -10,335,Siglingastofnun Íslands -10,336,Hafnarframkvæmdir -10,381,Rannsóknanefnd sjóslysa -10,471,Flugmálastjórn Íslands -10,475,Flugvellir og flugleiðsöguþjónusta -10,481,Rannsóknanefnd flugslysa -10,512,Póst- og fjarskiptastofnunin -10,513,Jöfnunarsjóður alþjónustu -10,521,Fjarskiptasjóður -10,801,Jöfnunarsjóður sveitarfélaga -10,811,Bjargráðasjóður -11,101,Iðnaðarráðuneyti, aðalskrifstofa -11,199,Ráðstöfunarfé -11,205,Nýsköpunarmiðstöð Íslands -11,240,Iðnaðarrannsóknir og stóriðja -11,242,Tækniþróunarsjóður -11,245,Samtök iðnaðarins -11,251,Endurgreiðslur vegna kvikmyndagerðar á Íslandi -11,299,Iðja og iðnaður, framlög -11,301,Orkustofnun -11,371,Orkusjóður -11,373,Niðurgreiðslur á húshitun -11,375,Jöfnun kostnaðar við dreifingu raforku -11,399,Ýmis orkumál -11,401,Byggðaáætlun -11,411,Byggðastofnun -11,501,Ferðamálastofa -11,599,Ýmis ferðamál -12,101,Viðskiptaráðuneyti, aðalskrifstofa -12,190,Ýmis verkefni -12,199,Ráðstöfunarfé -12,402,Fjármálaeftirlitið -12,411,Samkeppniseftirlitið -12,421,Neytendastofa -12,425,Talsmaður neytenda -12,431,Einkaleyfastofan -12,811,Flutningssjóður olíuvara -14,101,Umhverfisráðuneyti, aðalskrifstofa -14,190,Ýmis verkefni -14,199,Ráðstöfunarfé -14,202,Náttúrurannsóknastöðin við Mývatn -14,211,Umhverfisstofnun -14,212,Vatnajökulsþjóðgarður -14,231,Landgræðsla ríkisins -14,241,Skógrækt ríkisins -14,243,Hekluskógar -14,281,Styrkir til fráveitna sveitarfélaga -14,287,Úrvinnslusjóður -14,289,Endurvinnslan hf. -14,301,Skipulagsstofnun -14,303,Skipulagsmál sveitarfélaga -14,310,Landmælingar Íslands -14,321,Brunamálastofnun ríkisins -14,381,Ofanflóðasjóður -14,401,Náttúrufræðistofnun Íslands -14,403,Náttúrustofur -14,407,Stofnun Vilhjálms Stefánssonar -14,412,Veðurstofa Íslands -19,801,Vaxtagjöld ríkissjóðs diff --git a/server/temp/yfirflokkar.sql b/server/temp/yfirflokkar.sql deleted file mode 100644 index 3980ed2..0000000 --- a/server/temp/yfirflokkar.sql +++ /dev/null @@ -1,15 +0,0 @@ -INSERT INTO items (code, name, parent) VALUES ('00', '��sta stj�rn r�kisins', 0); -INSERT INTO items (code, name, parent) VALUES ('01', 'Fors�tisr��uneyti', 0); -INSERT INTO items (code, name, parent) VALUES ('02', 'Menntam�lar��uneyti', 0); -INSERT INTO items (code, name, parent) VALUES ('03', 'Utanr�kisr��uneyti', 0); -INSERT INTO items (code, name, parent) VALUES ('04', 'Sj�var�tvegs- og landb�na�arr��uneyti', 0); -INSERT INTO items (code, name, parent) VALUES ('06', 'D�ms- og kirkjum�lar��uneyti', 0); -INSERT INTO items (code, name, parent) VALUES ('07', 'F�lags- og tryggingam�lar��uneyti', 0); -INSERT INTO items (code, name, parent) VALUES ('08', 'Heilbrig�isr��uneyti', 0); -INSERT INTO items (code, name, parent) VALUES ('09', 'Fj�rm�lar��uneyti', 0); -INSERT INTO items (code, name, parent) VALUES ('10', 'Samg�ngur��uneyti', 0); -INSERT INTO items (code, name, parent) VALUES ('11', 'I�na�arr��uneyti', 0); -INSERT INTO items (code, name, parent) VALUES ('12', 'Vi�skiptar��uneyti', 0); -INSERT INTO items (code, name, parent) VALUES ('14', 'Umhverfisr��uneyti', 0); -INSERT INTO items (code, name, parent) VALUES ('19', 'Vaxtagj�ld r�kissj��s', 0); - diff --git a/server/temp/yfirflokkarsorted.csv b/server/temp/yfirflokkarsorted.csv deleted file mode 100644 index 7874207..0000000 --- a/server/temp/yfirflokkarsorted.csv +++ /dev/null @@ -1,15 +0,0 @@ -'00','æðssta stjórn ríkisins' -'01','Forsætisráðuneyti' -'02','Menntamálaráðuneyti' -'03','Utanríkisráðuneyti' -'04','Sjávarútvegs- og landbúnaðarráðuneyti' -'06','Dóms- og kirkjumálaráðuneyti' -'07','Félags- og tryggingamálaráðuneyti' -'08','Heilbrigðisráðuneyti' -'09','Fjármálaráðuneyti' -'10','Samgönguráðuneyti' -'11','Iðnaðarráðuneyti' -'12','Viðskiptaráðuneyti' -'14','Umhverfisráðuneyti' -'19','Vaxtagjöld ríkissjóðs' - |